[pkgsrc/trunk]: pkgsrc mk/emulator: Move Linux shlibs task settings to packag...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc mk/emulator: Move Linux shlibs task settings to packag...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:42:58 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/7fcff4c2f5e7
branches:  trunk
changeset: 366988:7fcff4c2f5e7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Aug 21 12:49:16 2017 +0000

description:
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:

 emulators/darwin_lib/Makefile           |   4 ++--
 emulators/osf1_lib/Makefile             |   4 ++--
 emulators/suse100_base/Makefile         |  11 ++++++++---
 emulators/suse100_linux/Makefile.common |   5 ++++-
 emulators/suse100_linux/emulator.mk     |  11 ++++++++++-
 emulators/suse121_base/Makefile         |  11 ++++++++---
 emulators/suse121_linux/Makefile.common |   5 ++++-
 emulators/suse121_linux/emulator.mk     |  11 ++++++++++-
 emulators/suse131_base/Makefile         |  11 ++++++++---
 emulators/suse131_linux/Makefile.common |   5 ++++-
 emulators/suse131_linux/emulator.mk     |  11 ++++++++++-
 mk/emulator/linux.mk                    |   7 +------
 mk/emulator/pkg-rpm.mk                  |   5 +----
 13 files changed, 72 insertions(+), 29 deletions(-)

diffs (289 lines):

diff -r 3c99322b4b0e -r 7fcff4c2f5e7 emulators/darwin_lib/Makefile
--- a/emulators/darwin_lib/Makefile     Mon Aug 21 12:48:25 2017 +0000
+++ b/emulators/darwin_lib/Makefile     Mon Aug 21 12:49:16 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2016/07/09 06:38:15 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2017/08/21 12:49:16 jlam Exp $
 
 DISTNAME=      darwin_lib-6.6.2
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    emulators
 MASTER_SITES=  # http://www.opendarwin.org/downloads/6.6.2/RPMS/ \
 #              http://www.opendarwin.org/downloads/6.6.2/RPMS/${DARWIN_ARCH}/
diff -r 3c99322b4b0e -r 7fcff4c2f5e7 emulators/osf1_lib/Makefile
--- a/emulators/osf1_lib/Makefile       Mon Aug 21 12:48:25 2017 +0000
+++ b/emulators/osf1_lib/Makefile       Mon Aug 21 12:49:16 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2016/07/09 06:38:15 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2017/08/21 12:49:16 jlam Exp $
 
 DISTNAME=      netscape-4.7-3.alpha
 PKGNAME=       osf1_lib-1.1
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    emulators
 #MASTER_SITES= ftp://digital.com/pub/alphaserver/archive/linuxalphatools/netscape/
 MASTER_SITES=  ftp://ftp.hp.com/pub/alphaserver/archive/linuxalphatools/netscape/
diff -r 3c99322b4b0e -r 7fcff4c2f5e7 emulators/suse100_base/Makefile
--- a/emulators/suse100_base/Makefile   Mon Aug 21 12:48:25 2017 +0000
+++ b/emulators/suse100_base/Makefile   Mon Aug 21 12:49:16 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2016/07/09 06:38:16 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2017/08/21 12:49:16 jlam Exp $
 
 PKGNAME=       suse_base-${SUSE_VERSION}
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    emulators
 
 MAINTAINER=    tonio%NetBSD.org@localhost
@@ -22,7 +22,7 @@
                        ./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype
 
 LINUX_LDD=             ${EMULDIR}/usr/bin/ldd
-LINUX_LDCONFIG=                ${EMULDIR}/usr/sbin/ldconfig
+LINUX_LDCONFIG=                ${EMULDIR}/sbin/ldconfig
 
 INSTALLATION_DIRS+=    sbin emul/linux/etc
 OWN_DIRS+=             ${EMULSUBDIR}
@@ -37,6 +37,11 @@
 #
 BRANDELF_CMD=  ${BRANDELF:D${BRANDELF} -t Linux ${DESTDIR}${LINUX_LDCONFIG}:U${TRUE}}
 
+# This package provides the ldconfig(8) binary, so that binary can't
+# be used during postremove.
+#
+LDCONFIG_REMOVE_CMD=   ${TRUE}
+
 post-extract:
        ${CP} ${FILESDIR}/SuSE-release ${WRKSRC}
        ${CP} ${FILESDIR}/*.sh ${WRKSRC}
diff -r 3c99322b4b0e -r 7fcff4c2f5e7 emulators/suse100_linux/Makefile.common
--- a/emulators/suse100_linux/Makefile.common   Mon Aug 21 12:48:25 2017 +0000
+++ b/emulators/suse100_linux/Makefile.common   Mon Aug 21 12:49:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2015/02/16 10:15:44 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.29 2017/08/21 12:49:16 jlam Exp $
 #
 # used by emulators/suse100_alsa/Makefile
 # used by emulators/suse100_alsa/Makefile
@@ -123,6 +123,9 @@
 #
 .sinclude "${SUSE_PKGSRCDIR}/suse.${EMUL_ARCH}.mk"
 
+# By default, run ldconfig(8) after installing a SuSE package.
+RUN_LDCONFIG?=         yes
+
 .if defined(DISTFILES) && !empty(DISTFILES)
 .  for fetchfile in ${DISTFILES}
 .    if "${fetchfile:C/.[^.]*\.rpm$//:C/^.*-//g:M*.*}" != ""
diff -r 3c99322b4b0e -r 7fcff4c2f5e7 emulators/suse100_linux/emulator.mk
--- a/emulators/suse100_linux/emulator.mk       Mon Aug 21 12:48:25 2017 +0000
+++ b/emulators/suse100_linux/emulator.mk       Mon Aug 21 12:49:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: emulator.mk,v 1.9 2014/04/08 10:05:44 obache Exp $
+# $NetBSD: emulator.mk,v 1.10 2017/08/21 12:49:16 jlam Exp $
 #
 # This file is included by linux-suse.mk in the emulator framework.
 #
@@ -50,3 +50,12 @@
        ${DEPENDS_suse-10.0.${_mod_}:S/^suse_/suse32_/:S/suse100_/&32_/}
 .  endfor
 .endif
+
+# 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
diff -r 3c99322b4b0e -r 7fcff4c2f5e7 emulators/suse121_base/Makefile
--- a/emulators/suse121_base/Makefile   Mon Aug 21 12:48:25 2017 +0000
+++ b/emulators/suse121_base/Makefile   Mon Aug 21 12:49:16 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2016/07/09 06:38:16 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/08/21 12:49:16 jlam Exp $
 
 PKGNAME=       suse_base-${SUSE_VERSION}
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    emulators
 RPMUPDPKGS+=   aaa_base-${SUSE_VERSION}-534.113.1.${SUSE_ARCH}
 RPMUPDPKGS+=   bash-4.2-1.14.1.${SUSE_ARCH}
@@ -54,7 +54,7 @@
                        ./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype
 
 LINUX_LDD=             ${EMULDIR}/usr/bin/ldd
-LINUX_LDCONFIG=                ${EMULDIR}/usr/sbin/ldconfig
+LINUX_LDCONFIG=                ${EMULDIR}/sbin/ldconfig
 
 INSTALLATION_DIRS+=    ${EMULDIR}/etc ${EMULDIR}/dev/shm ${EMULDIR}/var/lock
 INSTALLATION_DIRS+=    sbin
@@ -70,6 +70,11 @@
 #
 BRANDELF_CMD=  ${BRANDELF:D${BRANDELF} -t Linux ${DESTDIR}${LINUX_LDCONFIG}:U${TRUE}}
 
+# This package provides the ldconfig(8) binary, so that binary can't
+# be used during postremove.
+#
+LDCONFIG_REMOVE_CMD=   ${TRUE}
+
 post-extract:
        ${CP} ${FILESDIR}/SuSE-release ${WRKSRC}
        ${CP} ${FILESDIR}/*.sh ${WRKSRC}
diff -r 3c99322b4b0e -r 7fcff4c2f5e7 emulators/suse121_linux/Makefile.common
--- a/emulators/suse121_linux/Makefile.common   Mon Aug 21 12:48:25 2017 +0000
+++ b/emulators/suse121_linux/Makefile.common   Mon Aug 21 12:49:16 2017 +0000
@@ -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 @@
 #
 .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 -r 3c99322b4b0e -r 7fcff4c2f5e7 emulators/suse121_linux/emulator.mk
--- a/emulators/suse121_linux/emulator.mk       Mon Aug 21 12:48:25 2017 +0000
+++ b/emulators/suse121_linux/emulator.mk       Mon Aug 21 12:49:16 2017 +0000
@@ -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-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
diff -r 3c99322b4b0e -r 7fcff4c2f5e7 emulators/suse131_base/Makefile
--- a/emulators/suse131_base/Makefile   Mon Aug 21 12:48:25 2017 +0000
+++ b/emulators/suse131_base/Makefile   Mon Aug 21 12:49:16 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2016/07/09 06:38:16 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2017/08/21 12:49:16 jlam Exp $
 
 PKGNAME=       suse_base-${SUSE_VERSION}
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    emulators
 RPMUPDPKGS+=   aaa_base-${SUSE_VERSION}-16.49.1.${SUSE_ARCH}
 RPMUPDPKGS+=   bash-4.2-68.12.1.${SUSE_ARCH}
@@ -43,7 +43,7 @@
                        ./etc/rc.d.README ./etc/rpc ./etc/shells ./etc/ttytype
 
 LINUX_LDD=             ${EMULDIR}/usr/bin/ldd
-LINUX_LDCONFIG=                ${EMULDIR}/usr/sbin/ldconfig
+LINUX_LDCONFIG=                ${EMULDIR}/sbin/ldconfig
 
 INSTALLATION_DIRS+=    ${EMULDIR}/etc ${EMULDIR}/dev/shm ${EMULDIR}/var/lock
 INSTALLATION_DIRS+=    sbin
@@ -59,6 +59,11 @@
 #
 BRANDELF_CMD=  ${BRANDELF:D${BRANDELF} -t Linux ${DESTDIR}${LINUX_LDCONFIG}:U${TRUE}}
 
+# This package provides the ldconfig(8) binary, so that binary can't
+# be used during postremove.
+#
+LDCONFIG_REMOVE_CMD=   ${TRUE}
+
 post-extract:
        ${CP} ${FILESDIR}/*.sh ${WRKSRC}
 
diff -r 3c99322b4b0e -r 7fcff4c2f5e7 emulators/suse131_linux/Makefile.common
--- a/emulators/suse131_linux/Makefile.common   Mon Aug 21 12:48:25 2017 +0000
+++ b/emulators/suse131_linux/Makefile.common   Mon Aug 21 12:49:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2017/04/27 22:59:54 kamil Exp $
+# $NetBSD: Makefile.common,v 1.18 2017/08/21 12:49:16 jlam Exp $
 #
 # used by emulators/suse131_alsa/Makefile
 # used by emulators/suse131_aspell/Makefile
@@ -123,6 +123,9 @@
 #
 .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 -r 3c99322b4b0e -r 7fcff4c2f5e7 emulators/suse131_linux/emulator.mk
--- a/emulators/suse131_linux/emulator.mk       Mon Aug 21 12:48:25 2017 +0000
+++ b/emulators/suse131_linux/emulator.mk       Mon Aug 21 12:49:16 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: emulator.mk,v 1.8 2017/03/06 11:53:54 hauke Exp $
+# $NetBSD: emulator.mk,v 1.9 2017/08/21 12:49:16 jlam Exp $
 #
 # This file is included by linux-suse.mk in the emulator framework.
 #
@@ -75,3 +75,12 @@
        ${DEPENDS_suse-13.1.${_mod_}:S/^suse_/suse32_/:S/suse131_/&32_/}
 .  endfor
 .endif
+
+# 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
diff -r 3c99322b4b0e -r 7fcff4c2f5e7 mk/emulator/linux.mk
--- a/mk/emulator/linux.mk      Mon Aug 21 12:48:25 2017 +0000
+++ b/mk/emulator/linux.mk      Mon Aug 21 12:49:16 2017 +0000
@@ -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 @@
 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 -r 3c99322b4b0e -r 7fcff4c2f5e7 mk/emulator/pkg-rpm.mk
--- a/mk/emulator/pkg-rpm.mk    Mon Aug 21 12:48:25 2017 +0000
+++ b/mk/emulator/pkg-rpm.mk    Mon Aug 21 12:49:16 2017 +0000
@@ -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 @@
 # 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"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-Config-AutoConf to 0.315
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/ruby-ronn Initial import of ruby-ronn, version 0...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-Config-AutoConf to 0.315
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/ruby-ronn Initial import of ruby-ronn, version 0...
Indexes:
Home | Main Index | Thread Index | Old Index