git: 8a8e486050c9 - main - Mk/bsd.port.mk: Fix SHLIB_PROVIDE_PATHS_COMPAT_LINUX for i386
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 21 Apr 2025 06:27:53 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8a8e486050c90ba26af3929bb151c135e9ad6cb0
commit 8a8e486050c90ba26af3929bb151c135e9ad6cb0
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-04-18 13:43:00 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-04-21 06:27:36 +0000
Mk/bsd.port.mk: Fix SHLIB_PROVIDE_PATHS_COMPAT_LINUX for i386
Approved by: bapt
Differential Revision: https://reviews.freebsd.org/D49888
---
Mk/bsd.port.mk | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index fa58fd5f7032..4596b773b6d3 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1889,8 +1889,12 @@ _ALL_LIB_DIRS_32= /usr/lib32 ${LOCALBASE}/lib32 ${USE_LDCONFIG32}
PKG_ENV+= SHLIB_PROVIDE_PATHS_COMPAT_32="${_ALL_LIB_DIRS_32:O:u:ts,}"
. endif
. if ${LINUX_DEFAULT} == c7 || ${LINUX_DEFAULT} == rl9
+. if ${ARCH} == i386
+PKG_ENV+= SHLIB_PROVIDE_PATHS_COMPAT_LINUX="${LINUXBASE}/usr/lib"
+. else
PKG_ENV+= SHLIB_PROVIDE_PATHS_COMPAT_LINUX="${LINUXBASE}/usr/lib64"
PKG_ENV+= SHLIB_PROVIDE_PATHS_COMPAT_LINUX_32="${LINUXBASE}/usr/lib"
+. endif
. else
. warning "Unknown Linux distribution ${LINUX_DEFAULT}, SHLIB_PROVIDE_PATHS_COMPAT_LINUX will not be set!"
. endif