Date: Fri, 28 Jul 2023 00:02:14 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: Yuri <yuri@aetern.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 264594efbe69 - main - Makefile.inc1: Automatically generate _LIBCOMPATS and list-old-* libcompats Message-ID: <49A99144-4922-4A25-A0A5-5F0ACF97E436@freebsd.org> In-Reply-To: <782afb67-124c-1ab9-9b41-129d1b9a91f8@aetern.org> References: <202307270411.36R4BrmB097493@gitrepo.freebsd.org> <782afb67-124c-1ab9-9b41-129d1b9a91f8@aetern.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 27 Jul 2023, at 23:33, Yuri <yuri@aetern.org> wrote: >=20 > Jessica Clarke wrote: >> The branch main has been updated by jrtc27: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D264594efbe699defbe2ac4e1d7a91fde= 3db45e8f >>=20 >> commit 264594efbe699defbe2ac4e1d7a91fde3db45e8f >> Author: Jessica Clarke <jrtc27@FreeBSD.org> >> AuthorDate: 2023-07-27 04:10:43 +0000 >> Commit: Jessica Clarke <jrtc27@FreeBSD.org> >> CommitDate: 2023-07-27 04:10:43 +0000 >>=20 >> Makefile.inc1: Automatically generate _LIBCOMPATS and list-old-* = libcompats >=20 > This seems to break the list-old-libs target for me (with or without > WITHOUT_LIB32=3D in src.conf): >=20 > $ make list-old-libs > /bin/sh: -V: not found >=20 > Reverting this commit makes it work again. >=20 >> Reviewed by: brooks, jhb >> Differential Revision: https://reviews.freebsd.org/D41180 >> --- >> Makefile.inc1 | 19 ++++++++++++------- >> 1 file changed, 12 insertions(+), 7 deletions(-) >>=20 >> diff --git a/Makefile.inc1 b/Makefile.inc1 >> index 53699a454ff6..b3a33a928ee5 100644 >> --- a/Makefile.inc1 >> +++ b/Makefile.inc1 >> @@ -857,9 +857,12 @@ XCFLAGS+=3D --sysroot=3D${WORLDTMP} >> XCFLAGS+=3D ${BFLAGS} >> .endif >>=20 >> -.if ${MK_LIB32} =3D=3D "yes" >> -_LIBCOMPATS+=3D 32 >> +.include "share/mk/bsd.compat.pre.mk" >> +.for LIBCOMPAT in ${_ALL_LIBCOMPATS} >> +.if ${MK_LIB${LIBCOMPAT}} =3D=3D "yes" >> +_LIBCOMPATS+=3D ${LIBCOMPAT} >> .endif >> +.endfor >> .include "Makefile.libcompat" >>=20 >> # META_MODE normally ignores host file changes since every build = updates >> @@ -3255,8 +3258,9 @@ list-old-files: .PHONY >> @cd ${.CURDIR}; \ >> ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ >> -V "OLD_FILES:ts\n" -V "OLD_FILES:Musr/share/*.gz:R:ts\n" \ >> - -V "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib32,:ts\n" \ >> - -V "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib32,:ts\n" | sort >> + ${_ALL_libcompats:@v@-V = "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib$v,:ts\n"@} \ >> + ${_ALL_libcompats:@v@-V = "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib$v,:ts\n"@} | \ >> + sort >>=20 >> delete-old-files: .PHONY >> @echo ">>> Removing old files (only deletes safe to delete libs)" >> @@ -3321,9 +3325,10 @@ list-old-libs: .PHONY >> @cd ${.CURDIR}; \ >> ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ >> -V "OLD_LIBS:ts\n" -V "MOVED_LIBS:ts\n" \ >> - -V "OLD_LIBS:Mlib/*:S,^lib,usr/lib32,:ts\n" \ >> - -V "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib32,:ts\n" \ >> - -V "OLD_LIBS:Mlib/casper/*:S,^lib/casper,usr/lib32,:ts\n" | = sort >> + ${_ALL_libcompats:@v@-V = "OLD_LIBS:Mlib/*:S,^lib,usr/lib$v,:ts\n"@} \ >> + ${_ALL_libcompats:@v@-V = "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib$v,:ts\n"@} | \ >=20 > Looks like there is stray pipe symbol. Oops, copy paste strikes again. Does deleting the pipe symbol, i.e. the following patch, also fix things for you, rather than reverting the commit? > diff --git a/Makefile.inc1 b/Makefile.inc1 > index af7d5b8ad0c5..2e965b603d78 100644 > --- a/Makefile.inc1 > +++ b/Makefile.inc1 > @@ -3368,7 +3368,7 @@ list-old-libs: .PHONY > ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ > -V "OLD_LIBS:ts\n" -V "MOVED_LIBS:ts\n" \ > ${_ALL_libcompats:@v@-V = "OLD_LIBS:Mlib/*:S,^lib,usr/lib$v,:ts\n"@} \ > - ${_ALL_libcompats:@v@-V = "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib$v,:ts\n"@} | \ > + ${_ALL_libcompats:@v@-V = "OLD_LIBS:Musr/lib/*:S,^usr/lib,usr/lib$v,:ts\n"@} \ > ${_ALL_libcompats:@v@-V = "OLD_LIBS:Mlib/casper/*:S,^lib/casper,usr/lib$v,:ts\n"@} | \ > sort > =20 Thanks for the report. Jess=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?49A99144-4922-4A25-A0A5-5F0ACF97E436>