Date: Sat, 26 Sep 2015 12:25:53 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397965 - in head/misc: compat10x compat4x compat5x compat6x compat7x compat8x compat9x Message-ID: <201509261225.t8QCPrtP046216@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Sep 26 12:25:52 2015 New Revision: 397965 URL: https://svnweb.freebsd.org/changeset/ports/397965 Log: Remove @exec lines redundant with USE_LDCONFIG32 Modified: head/misc/compat10x/Makefile head/misc/compat10x/pkg-plist.amd64 head/misc/compat4x/Makefile head/misc/compat4x/pkg-plist.freebsd5 head/misc/compat5x/Makefile head/misc/compat5x/pkg-plist head/misc/compat6x/Makefile head/misc/compat6x/pkg-plist.amd64 head/misc/compat7x/Makefile head/misc/compat7x/pkg-plist.amd64 head/misc/compat8x/Makefile head/misc/compat8x/pkg-plist.amd64 head/misc/compat9x/Makefile head/misc/compat9x/pkg-plist.amd64 Modified: head/misc/compat10x/Makefile ============================================================================== --- head/misc/compat10x/Makefile Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat10x/Makefile Sat Sep 26 12:25:52 2015 (r397965) @@ -27,7 +27,6 @@ IGNORE= is for FreeBSD 10.x and newer .endif .if ${ARCH} == amd64 -PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32" USE_LDCONFIG32= ${TARGET32_DIR} .endif Modified: head/misc/compat10x/pkg-plist.amd64 ============================================================================== --- head/misc/compat10x/pkg-plist.amd64 Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat10x/pkg-plist.amd64 Sat Sep 26 12:25:52 2015 (r397965) @@ -14,4 +14,3 @@ lib32/compat/libipx.so.5 lib32/compat/libopie.so.7 lib32/compat/libreadline.so.8 lib32/compat/libsbuf.so.6 -@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat Modified: head/misc/compat4x/Makefile ============================================================================== --- head/misc/compat4x/Makefile Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat4x/Makefile Sat Sep 26 12:25:52 2015 (r397965) @@ -20,7 +20,6 @@ WRKSRC= ${WRKDIR}/usr/lib/compat NO_BUILD= yes TARGET_DIR= ${PREFIX}/lib/compat TARGET32_DIR= ${PREFIX}/lib32/compat -LDCONFIG_LIB32= ${LDCONFIG} -32 .include <bsd.port.pre.mk> @@ -50,7 +49,6 @@ PLIST_SUB+= I386_ONLY="@comment " .if ${ARCH} == amd64 PLIST_SUB+= AMD64_ONLY="" AMD64NA="@comment " -PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32" USE_LDCONFIG32= ${TARGET32_DIR} .else USE_LDCONFIG= ${TARGET_DIR} Modified: head/misc/compat4x/pkg-plist.freebsd5 ============================================================================== --- head/misc/compat4x/pkg-plist.freebsd5 Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat4x/pkg-plist.freebsd5 Sat Sep 26 12:25:52 2015 (r397965) @@ -37,5 +37,4 @@ %%LIBDIR%%/compat/pam_ssh.so %%LIBDIR%%/compat/pam_tacplus.so %%LIBDIR%%/compat/pam_unix.so -%%AMD64_ONLY%%@exec %%LDCONFIG_LIB32%% -m %D/%%LIBDIR%%/compat @comment Hardcode lib32 since we should not remove lib. Modified: head/misc/compat5x/Makefile ============================================================================== --- head/misc/compat5x/Makefile Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat5x/Makefile Sat Sep 26 12:25:52 2015 (r397965) @@ -35,7 +35,6 @@ BROKEN= Does not install on sparc64: fa .if ${ARCH} == amd64 PLIST_SUB+= AMD64="" -PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32" USE_LDCONFIG32= ${TARGET32_DIR} .else PLIST_SUB+= AMD64="@comment " Modified: head/misc/compat5x/pkg-plist ============================================================================== --- head/misc/compat5x/pkg-plist Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat5x/pkg-plist Sat Sep 26 12:25:52 2015 (r397965) @@ -208,4 +208,3 @@ lib/compat/snmp_netgraph.so.2 %%AMD64%%lib32/compat/snmp_atm.so.2 %%AMD64%%lib32/compat/snmp_mibII.so.2 %%AMD64%%lib32/compat/snmp_netgraph.so.2 -%%AMD64%%@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat Modified: head/misc/compat6x/Makefile ============================================================================== --- head/misc/compat6x/Makefile Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat6x/Makefile Sat Sep 26 12:25:52 2015 (r397965) @@ -28,7 +28,6 @@ BROKEN= Does not install on sparc64: fa .endif .if ${ARCH} == amd64 -PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32" USE_LDCONFIG32= ${TARGET32_DIR} .endif Modified: head/misc/compat6x/pkg-plist.amd64 ============================================================================== --- head/misc/compat6x/pkg-plist.amd64 Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat6x/pkg-plist.amd64 Sat Sep 26 12:25:52 2015 (r397965) @@ -207,4 +207,3 @@ lib32/compat/pam_self.so.3 lib32/compat/pam_ssh.so.3 lib32/compat/pam_tacplus.so.3 lib32/compat/pam_unix.so.3 -@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat Modified: head/misc/compat7x/Makefile ============================================================================== --- head/misc/compat7x/Makefile Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat7x/Makefile Sat Sep 26 12:25:52 2015 (r397965) @@ -23,7 +23,6 @@ USE_LDCONFIG= ${TARGET_DIR} .include <bsd.port.pre.mk> .if ${ARCH} == amd64 -PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32" USE_LDCONFIG32= ${TARGET32_DIR} .endif Modified: head/misc/compat7x/pkg-plist.amd64 ============================================================================== --- head/misc/compat7x/pkg-plist.amd64 Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat7x/pkg-plist.amd64 Sat Sep 26 12:25:52 2015 (r397965) @@ -222,4 +222,3 @@ lib32/compat/pam_self.so.4 lib32/compat/pam_ssh.so.4 lib32/compat/pam_tacplus.so.4 lib32/compat/pam_unix.so.4 -@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat Modified: head/misc/compat8x/Makefile ============================================================================== --- head/misc/compat8x/Makefile Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat8x/Makefile Sat Sep 26 12:25:52 2015 (r397965) @@ -29,7 +29,6 @@ RUN_DEPENDS= ${LOCALBASE}/lib/compat/lib .endif .if ${ARCH} == amd64 -PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32" USE_LDCONFIG32= ${TARGET32_DIR} .endif Modified: head/misc/compat8x/pkg-plist.amd64 ============================================================================== --- head/misc/compat8x/pkg-plist.amd64 Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat8x/pkg-plist.amd64 Sat Sep 26 12:25:52 2015 (r397965) @@ -22,4 +22,3 @@ lib32/compat/libtacplus.so.4 lib32/compat/libufs.so.5 lib32/compat/libutil.so.8 lib32/compat/libz.so.5 -@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat Modified: head/misc/compat9x/Makefile ============================================================================== --- head/misc/compat9x/Makefile Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat9x/Makefile Sat Sep 26 12:25:52 2015 (r397965) @@ -27,7 +27,6 @@ IGNORE= is for FreeBSD 9.x and newer .endif .if ${ARCH} == amd64 -PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32" USE_LDCONFIG32= ${TARGET32_DIR} .endif Modified: head/misc/compat9x/pkg-plist.amd64 ============================================================================== --- head/misc/compat9x/pkg-plist.amd64 Sat Sep 26 12:24:56 2015 (r397964) +++ head/misc/compat9x/pkg-plist.amd64 Sat Sep 26 12:25:52 2015 (r397965) @@ -41,4 +41,3 @@ lib32/compat/libssl.so.6 lib32/compat/libstdc++.so.6 lib32/compat/libsupc++.so.1 lib32/compat/libusb.so.2 -@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509261225.t8QCPrtP046216>