From 8a8e486050c90ba26af3929bb151c135e9ad6cb0 Mon Sep 17 00:00:00 2001 From: Gleb Popov Date: Fri, 18 Apr 2025 16:43:00 +0300 Subject: [PATCH] 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