Date: Sat, 16 Mar 2019 14:34:30 +0100 From: "Ronald Klop" <ronald-lists@klop.ws> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, "Emmanuel Vadot" <manu@freebsd.org> Subject: Re: svn commit: r345159 - head Message-ID: <op.zyqynss6kndu52@sjakie> In-Reply-To: <201903142208.x2EM8Akf049649@repo.freebsd.org> References: <201903142208.x2EM8Akf049649@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Thanks! A very welcome user friendlyness. On Thu, 14 Mar 2019 23:08:10 +0100, Emmanuel Vadot <manu@freebsd.org> wrote: > Author: manu > Date: Thu Mar 14 22:08:09 2019 > New Revision: 345159 > URL: https://svnweb.freebsd.org/changeset/base/345159 > > Log: > pkgbase: Use uname as ABI_FILE > uname is always rebuild on FreeBSD so use this as ABI_FILE for pkg when > building pkg for pkgbase. > pkg uses uname too as default ABI_FILE as of commit > d8bbf980b7f6f424fb7cc672c23ab2dfc82b6599 > https://github.com/freebsd/pkg/commit/d8bbf980b7f6f424fb7cc672c23ab2dfc82b6599 > Discussed with: bapt > MFC after: 1 week > > Modified: > head/Makefile.inc1 > > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Thu Mar 14 21:08:48 2019 (r345158) > +++ head/Makefile.inc1 Thu Mar 14 22:08:09 2019 (r345159) > @@ -1864,11 +1864,11 @@ create-world-package-${pkgname}: .PHONY > @if [ "${pkgname}" == "runtime" ]; then \ > sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" > ${WSTAGEDIR}/${pkgname}.ucl ; \ > fi > - ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ > + ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o > ALLOW_BASE_SHLIBS=yes \ > create -M ${WSTAGEDIR}/${pkgname}.ucl \ > -p ${WSTAGEDIR}/${pkgname}.plist \ > -r ${WSTAGEDIR} \ > - -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config > ABI)/${PKG_VERSION} > + -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname > config ABI)/${PKG_VERSION} > .endfor > _default_flavor= -default > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?op.zyqynss6kndu52>