From 28c9d1af052c08a2ec470e8dbce689794277ac70 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Wed, 2 Mar 2016 21:04:17 +0000 Subject: [PATCH] Set ALLOW_BASE_SHLIBS when creating base packages to enable shared library tracking. Note, this requires a patched pkg(8) to do anything, but pkg(8) does not complain when an option is specified that it does not recognize. Sponsored by: The FreeBSD Foundation --- Makefile.inc1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 9fa856986c5c..c1e320890d50 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1433,7 +1433,7 @@ create-world-packages: _pkgbootstrap /^name/ { printf("===> Creating %s-", $$2); next } \ /^version/ { print $$2; next } \ ' ${DESTDIR}/$${pkgname}.ucl ; \ - pkg -o ABI_FILE=${DESTDIR}/bin/sh \ + pkg -o ABI_FILE=${DESTDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ create -M ${DESTDIR}/$${pkgname}.ucl \ -p ${DESTDIR}/$${pkgname}.plist \ -r ${DESTDIR} \ @@ -1461,7 +1461,7 @@ create-kernel-packages: _pkgbootstrap /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \ ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.ucl ; \ - pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \ + pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ create -M ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.ucl \ -p ${DESTDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}-${flavor}.plist \ -r ${DESTDIR}/${DISTDIR} \ @@ -1490,7 +1490,7 @@ create-kernel-packages: _pkgbootstrap /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \ ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.ucl ; \ - pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh \ + pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ create -M ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.ucl \ -p ${DESTDIR}/kernel.${_kernel}/kernel.${_kernel}-${flavor}.plist \ -r ${DESTDIR}/kernel.${_kernel} \