Page MenuHomeFreeBSD
Files F169414942

D59301.diff
No OneTemporary
Actions

D59301.diff
View Options

diff --git a/Keywords/ldconfig.ucl b/Keywords/ldconfig.ucl
--- a/Keywords/ldconfig.ucl
+++ b/Keywords/ldconfig.ucl
@@ -1,16 +1,20 @@
# MAINTAINER: portmgr@FreeBSD.org
+actions: []
+arguments: true
post-install: <<EOD
- if ! /usr/sbin/service ldconfig restart >/dev/null; then
- if [ -z "${INSTALL_AS_USER}" ]; then
- exit 1
- fi
- fi
+ hints="${PKG_ROOTDIR}/var/run/ld-elf.so.hints"
+ flags="-f ${hints} -m"
+ [ -n "${INSTALL_AS_USER}" ] && flags="${flags} -i"
+ for dir in %@; do
+ /sbin/ldconfig ${flags} ${dir}
+ done
EOD
post-deinstall: <<EOD
- if ! /usr/sbin/service ldconfig restart >/dev/null; then
- if [ -z "${INSTALL_AS_USER}" ]; then
- exit 1
- fi
- fi
+ hints="${PKG_ROOTDIR}/var/run/ld-elf.so.hints"
+ flags="-f ${hints} -m"
+ [ -n "${INSTALL_AS_USER}" ] && flags="${flags} -i"
+ for dir in %@; do
+ /sbin/ldconfig ${flags} ${dir}
+ done
EOD
diff --git a/Keywords/ldconfig32.ucl b/Keywords/ldconfig32.ucl
new file mode 100644
--- /dev/null
+++ b/Keywords/ldconfig32.ucl
@@ -0,0 +1,20 @@
+# MAINTAINER: portmgr@FreeBSD.org
+
+actions: []
+arguments: true
+post-install: <<EOD
+ hints="${PKG_ROOTDIR}/var/run/ld-elf32.so.hints"
+ flags="-f ${hints} -m -32"
+ [ -n "${INSTALL_AS_USER}" ] && flags="${flags} -i"
+ for dir in %@; do
+ /sbin/ldconfig ${flags} ${dir}
+ done
+EOD
+post-deinstall: <<EOD
+ hints="${PKG_ROOTDIR}/var/run/ld-elf32.so.hints"
+ flags="-f ${hints} -m -32"
+ [ -n "${INSTALL_AS_USER}" ] && flags="${flags} -i"
+ for dir in %@; do
+ /sbin/ldconfig ${flags} ${dir}
+ done
+EOD
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1897,13 +1897,16 @@
. warning "Unknown Linux distribution ${LINUX_DEFAULT}, SHLIB_PROVIDE_PATHS_COMPAT_LINUX will not be set!"
. endif
-. if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
+. if defined(USE_LDCONFIG)
. if defined(USE_LINUX_PREFIX)
PLIST_FILES+= "@ldconfig-linux ${LINUXBASE}"
. else
-PLIST_FILES+= "@ldconfig"
+PLIST_FILES+= "@ldconfig ${USE_LDCONFIG}"
. endif
. endif
+. if defined(USE_LDCONFIG32)
+PLIST_FILES+= "@ldconfig32 ${USE_LDCONFIG32}"
+. endif
. if defined(NO_SHLIB_REQUIRES_GLOB)
PKG_ENV+= SHLIB_REQUIRE_IGNORE_GLOB="${NO_SHLIB_REQUIRES_GLOB:ts,}"

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 2, 11:55 AM (22 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37947358
Default Alt Text
D59301.diff (2 KB)

Event Timeline