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 /mk | |
| 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 'mk')
| -rw-r--r-- | mk/emulator/linux.mk | 7 | ||||
| -rw-r--r-- | mk/emulator/pkg-rpm.mk | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/mk/emulator/linux.mk b/mk/emulator/linux.mk index 8d03318a148..0df0fe13ae8 100644 --- a/mk/emulator/linux.mk +++ b/mk/emulator/linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: linux.mk,v 1.29 2015/04/12 12:21:29 wiz Exp $ +# $NetBSD: linux.mk,v 1.30 2017/08/21 12:49:17 jlam Exp $ # # Linux binary emulation framework # @@ -127,8 +127,3 @@ EMULSUBDIR= # empty DEPENDS_${EMUL_DISTRO}.${_mod_}= # empty . endfor .endif - -.if !defined(EMUL_IS_NATIVE) -LDCONFIG_ADD_CMD?= ${EMULDIR}/sbin/ldconfig -r ${EMULDIR} -LDCONFIG_REMOVE_CMD?= ${EMULDIR}/sbin/ldconfig -r ${EMULDIR} -.endif diff --git a/mk/emulator/pkg-rpm.mk b/mk/emulator/pkg-rpm.mk index 068c6828ccb..c2c144edccc 100644 --- a/mk/emulator/pkg-rpm.mk +++ b/mk/emulator/pkg-rpm.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkg-rpm.mk,v 1.6 2015/11/25 13:05:47 jperkin Exp $ +# $NetBSD: pkg-rpm.mk,v 1.7 2017/08/21 12:49:17 jlam Exp $ # # RPM package format # @@ -95,9 +95,6 @@ PLIST_SRC_DFLT+= ${RPM2PKG_PLIST} # We handle the extraction of the RPMs in the extract-rpm target below. EXTRACT_ONLY?= # empty -# Usually, packages we install via RPMs also install shared libraries. -_EMUL_RUN_LDCONFIG= yes - .PHONY: extract-rpm extract-rpm: @${STEP_MSG} "Extracting RPM files" |