diff options
| author | jlam <jlam@pkgsrc.org> | 2017-08-21 12:49:16 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2017-08-21 12:49:16 +0000 |
| commit | 2dfd54f2f5b873b10c39b8488819d0bb8d26b19d (patch) | |
| tree | e99a00d1233e6a8fff4537af2dac591d6c4c75fd /emulators/suse121_linux | |
| parent | 6cb62e4edc1fb5045ca0fe48140b5060e4acf90b (diff) | |
| download | pkgsrc-2dfd54f2f5b873b10c39b8488819d0bb8d26b19d.tar.gz | |
mk/emulator: Move Linux shlibs task settings to package Makefiles.
Move the definitions of LDCONFIG_ADD_CMD and LDCONFIG_REMOVE_CMD
into suse_linux/emulator.mk. The commands are specific to the
Linux installed, including the path to ldconfig(8), so localize
them to the package that provides it.
Move the definition of RUN_LDCONFIG out of the emulator framework
and into the packages that use them as RUN_LDCONFIG is meant to be
a package-settable variable.
Fix the path to the Linux ldconfig(8) that was used on FreeBSD to
brand the ELF format that has been incorrect for over 10 years.
In the suse_base packages, explicitly set LDCONFIG_REMOVE_CMD to
${TRUE} since the ldconfig(8) command is provided by that package
and can't be invoked at the postremove stage because it has already
been deleted from the system by then.
Bump the PKGREVISION of all the suse_base packages because the
install scripts have changed.
Bump the PKGREVISIONs of the darwin_lib and osf1_lib packages
because the install scripts no longer try to run ldconfig(8),
which is not provided in either OpenDarwin or OSF/1.
Diffstat (limited to 'emulators/suse121_linux')
| -rw-r--r-- | emulators/suse121_linux/Makefile.common | 5 | ||||
| -rw-r--r-- | emulators/suse121_linux/emulator.mk | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/emulators/suse121_linux/Makefile.common b/emulators/suse121_linux/Makefile.common index d90c1a339a9..4941011fa76 100644 --- a/emulators/suse121_linux/Makefile.common +++ b/emulators/suse121_linux/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2016/04/11 04:22:34 dbj Exp $ +# $NetBSD: Makefile.common,v 1.14 2017/08/21 12:49:16 jlam Exp $ # # used by emulators/suse121_alsa/Makefile # used by emulators/suse121_aspell/Makefile @@ -104,6 +104,9 @@ FILES_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q} # .sinclude "${SUSE_PKGSRCDIR}/suse.${EMUL_ARCH}.mk" +# By default, run ldconfig(8) after installing a SuSE package. +RUN_LDCONFIG?= yes + .if make(distinfo) || make(makedistinfo) || make(mdi) || make(makesum) PKG_FAIL_REASON+= "please use make emul-fetch or make emul-distinfo" .endif diff --git a/emulators/suse121_linux/emulator.mk b/emulators/suse121_linux/emulator.mk index e17039bb063..8957940648f 100644 --- a/emulators/suse121_linux/emulator.mk +++ b/emulators/suse121_linux/emulator.mk @@ -1,4 +1,4 @@ -# $NetBSD: emulator.mk,v 1.10 2015/09/26 01:05:31 kamil Exp $ +# $NetBSD: emulator.mk,v 1.11 2017/08/21 12:49:16 jlam Exp $ # # This file is included by linux-suse.mk in the emulator framework. # @@ -62,3 +62,12 @@ DEPENDS_suse-12.1.dbus= ${DEPENDS_suse-12.1.gtk2} DEPENDS_suse-12.1.dbus-glib= ${DEPENDS_suse-12.1.gtk2} DEPENDS_suse-12.1.libffi= ${DEPENDS_suse-12.1.gtk2} DEPENDS_suse-12.1.glib2= ${DEPENDS_suse-12.1.gtk2} + +# SuSE Linux's ld.so(8) uses a cache file of search paths for shared +# libraries which is managed by ldconfig(8). +# +.if !defined(EMUL_IS_NATIVE) +SUSE_LDCONFIG_CMD= ${EMULDIR}/sbin/ldconfig -r ${EMULDIR} +LDCONFIG_ADD_CMD?= ${SUSE_LDCONFIG_CMD} +LDCONFIG_REMOVE_CMD?= ${SUSE_LDCONFIG_CMD} +.endif |