From nobody Thu Jul 27 22:33:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RBlsf2Qf1z4pQSp; Thu, 27 Jul 2023 22:33:26 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RBlsf0QPyz3h4H; Thu, 27 Jul 2023 22:33:25 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 6819B32003AC; Thu, 27 Jul 2023 18:33:24 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 27 Jul 2023 18:33:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm3; t= 1690497203; x=1690583603; bh=4pC3lSdx7uAK/fhgGIiZa4p8AaXHEtEURK7 TmsfSr2U=; b=nrHYZkwZ8LRT4Zgs+61jU08HXzfjsAjYk+LHZUl9GWNU/jOiKgh qZzda2yBrNn0bNFZP2VHLibBwJoMIqGbBjg5Kk6fDOiCvuhcBHWjUiogiaCBKEZR 83kfnTCJjTKWOndHYY8GEUypIzJh66iecDWvJ1gK1x5jWw3xRoGZaGe95V2jSEd8 +8a+PiPCj3isKicqwzSv4Um85NwUeYDR1KPJcGknWxry7zVk6hi7UbwdJsSjVRDp 7kWKXPEtr1o+0mtQ/30Lr1ltbYM58tJ9ih3PEmCF4HfaF3jDB9LYCw8hOYcvBt2l 71szxSBmb6Pi5Uq2eaOLAVHhEvWs/vNazUw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1690497203; x= 1690583603; bh=4pC3lSdx7uAK/fhgGIiZa4p8AaXHEtEURK7TmsfSr2U=; b=Q kVa0Wukop9MF+7+u3A9U8bUPTgKqtIPbfzAYIX5JcW4+2XLEYzA8st5UC5M5lsyE 66k1RRJDuaBtbEogJNnaiEp3j6LhhgOTJKhZ6CQ5XOVokles0fy/OZkhfGasFZmt POFyZ58F5PwfYdnjQM0GOO6P5AhJDGgmJxWJAO2iCo4vlNkUxOSM0KS3ZNNVhGGV bwME3ZtXdBK6ocAHUIx6SXb8//5Vfr5tru7FAuW5e3W0sSo6ZU+bBu3+5K/AJFdb 8IdqZrVXOyZT7ItepuQABSaPEFIv/T/g4Cicpd2mr8cymOwwJuTm7iP9YsQ7fg7G q5RmUNt8A48Iz7/qb3U+w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrieehgddutdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepkfffgggfuffvfhfhjggtgfesthejre dttddvjeenucfhrhhomhepjghurhhiuceohihurhhisegrvghtvghrnhdrohhrgheqnecu ggftrfgrthhtvghrnhephefhkeefhfejffffgffhvddtheeileeftdegheekudetleeigf ettdehheeuveegnecuffhomhgrihhnpehfrhgvvggsshgurdhorhhgpdhprhgvrdhmkhen ucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeihuhhrih esrggvthgvrhhnrdhorhhg X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 27 Jul 2023 18:33:22 -0400 (EDT) Message-ID: <782afb67-124c-1ab9-9b41-129d1b9a91f8@aetern.org> Date: Fri, 28 Jul 2023 00:33:19 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 264594efbe69 - main - Makefile.inc1: Automatically generate _LIBCOMPATS and list-old-* libcompats Content-Language: en-US To: Jessica Clarke , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202307270411.36R4BrmB097493@gitrepo.freebsd.org> From: Yuri In-Reply-To: <202307270411.36R4BrmB097493@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4RBlsf0QPyz3h4H X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated Jessica Clarke wrote: > The branch main has been updated by jrtc27: > > URL: https://cgit.FreeBSD.org/src/commit/?id=264594efbe699defbe2ac4e1d7a91fde3db45e8f > > commit 264594efbe699defbe2ac4e1d7a91fde3db45e8f > Author: Jessica Clarke > AuthorDate: 2023-07-27 04:10:43 +0000 > Commit: Jessica Clarke > CommitDate: 2023-07-27 04:10:43 +0000 > > Makefile.inc1: Automatically generate _LIBCOMPATS and list-old-* libcompats This seems to break the list-old-libs target for me (with or without WITHOUT_LIB32= in src.conf): $ make list-old-libs /bin/sh: -V: not found Reverting this commit makes it work again. > Reviewed by: brooks, jhb > Differential Revision: https://reviews.freebsd.org/D41180 > --- > Makefile.inc1 | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > > diff --git a/Makefile.inc1 b/Makefile.inc1 > index 53699a454ff6..b3a33a928ee5 100644 > --- a/Makefile.inc1 > +++ b/Makefile.inc1 > @@ -857,9 +857,12 @@ XCFLAGS+= --sysroot=${WORLDTMP} > XCFLAGS+= ${BFLAGS} > .endif > > -.if ${MK_LIB32} == "yes" > -_LIBCOMPATS+= 32 > +.include "share/mk/bsd.compat.pre.mk" > +.for LIBCOMPAT in ${_ALL_LIBCOMPATS} > +.if ${MK_LIB${LIBCOMPAT}} == "yes" > +_LIBCOMPATS+= ${LIBCOMPAT} > .endif > +.endfor > .include "Makefile.libcompat" > > # 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 > > 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"@} | \ Looks like there is stray pipe symbol. > + ${_ALL_libcompats:@v@-V "OLD_LIBS:Mlib/casper/*:S,^lib/casper,usr/lib$v,:ts\n"@} | \ > + sort > > delete-old-libs: .PHONY > @echo ">>> Removing old libraries"