From nobody Thu Jul 27 23:12:52 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 4RBmlJ15Ptz4pv4b; Thu, 27 Jul 2023 23:13:00 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) (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 4RBmlH3CRlz41np; Thu, 27 Jul 2023 23:12:59 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 20D353200063; Thu, 27 Jul 2023 19:12:57 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 27 Jul 2023 19:12:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :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= 1690499576; x=1690585976; bh=ahKEjpUNoVQdmW6QHGFrXjhXnL7QTcYOyek C7koX5QI=; b=tL5I+UPS/2/n6jOvKDM5j1v8DriXZj51heqUf8pKdXIlFJVN3dZ OQaRyRJiVzAYIUb52xU3S6GYUonHMmSFI/VuCuz7fyWAaT99HOEoNZ7LdqByapB3 h1EykC0dG3w++ditSvYGOVfrPhwzDdB2NhK49ycjeNTjLZWh0CWIvd9ZFqsaJRdq zzn5eZ58TrvdGiRU13wqo2bkGWZgN8w29TRuk/6mWLabtdcUkUq2eZwgCVR6hBCL nnzA+RewClSZhFEvJf4vno5FWEubcMP3BwFnDtsXITJCNYnJphi72LlR1b/b95s4 0j3QWvu9rxBCJCZA0qlkA5mInE9qHj+Q/Dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc: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= 1690499576; x=1690585976; bh=ahKEjpUNoVQdmW6QHGFrXjhXnL7QTcYOyek C7koX5QI=; b=OXgePFS9GXk+VuxQIpa+F4zSJ34miQr9AEkgkvI9PKxUwEbROaR c9TfeQ1Bz9C7iLEccrRUKcRVUgm6OJjmadO/8r7ZlB0T7tUsxfbBvuuKjIo9EwqK v1LimyOzUFf91jO1ZCJYvXQtnzN0Fg9DVS7PuS3l8bmhcjBCGK4VtuAmEQHlPZtt TNJSUGAFPEA7EO6qrn9e9KVvwr2WtBFVMz+VdUppjRHKetlzSPeY/6cwgBMdHnD8 KjaANjiV1WRAGAk7GTKcK7YJFIujqPpQf7Bx7E5rUrHUudbFhr4a8URAcklz3Ddr 9P5T+yJnQj0q5mr6eLrEYMLgEVQcTDlBnPQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrieehgddukecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepkfffgggfuffvvehfhfgjtgfgsehtje ertddtvdejnecuhfhrohhmpegjuhhrihcuoeihuhhrihesrggvthgvrhhnrdhorhhgqeen ucggtffrrghtthgvrhhnpeekhfffgfetieelgeejvdetgeeuvedtieeuffffffelgeffud euleduheefjeejleenucffohhmrghinhepfhhrvggvsghsugdrohhrghdpphhrvgdrmhhk necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephihurh hisegrvghtvghrnhdrohhrgh X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 27 Jul 2023 19:12:55 -0400 (EDT) Message-ID: Date: Fri, 28 Jul 2023 01:12:52 +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 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202307270411.36R4BrmB097493@gitrepo.freebsd.org> <782afb67-124c-1ab9-9b41-129d1b9a91f8@aetern.org> <49A99144-4922-4A25-A0A5-5F0ACF97E436@freebsd.org> From: Yuri In-Reply-To: <49A99144-4922-4A25-A0A5-5F0ACF97E436@freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4RBmlH3CRlz41np 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: > On 27 Jul 2023, at 23:33, Yuri wrote: >> >> 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. > > 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? Yes, delete-old-libs now properly does its job of removing lib32 contents. >> 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 >> > > > Thanks for the report. > > Jess