From nobody Thu Jul 27 23:15:16 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 4RBmpB3Xg3z4pw3j for ; Thu, 27 Jul 2023 23:15:30 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RBmp94sdmz42ft for ; Thu, 27 Jul 2023 23:15:29 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-3fbc77e76abso15558415e9.1 for ; Thu, 27 Jul 2023 16:15:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690499728; x=1691104528; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7ccH66BV4v2YQ4oUBKAGUpvetAPImYZwgVB4J0vivzM=; b=JQXLECfHWH/Cl6Lkw2wR8IRBLavrpMvJGrvUGtkYIyfD/hHCwIDM6x5ot7nug0UWM1 8I+tg1dddwk9CSKd44v2HuHSR37ywmmGRjZTmWwmME9G5FS76NPfQESdBVSADJXDlNF+ E8dZ8FTL/D2oh4mnmpU3guRjpmxQQssS1+LAtQZs//nJITuWFUMkNbJUO2cOdboe9BPg hQsue1cVbG70W0m2jJtSl7e42qIecwqHis8xxXnZARzhaBm/VsWs1mmbTH02JV86ulz5 zWs00Jxlj1hNAwRas+uO0N1Mf6pJ4OiBtT4j32cmluSrzFukoe72igKRkhjUdGmGYvE/ pyDg== X-Gm-Message-State: ABy/qLaayCgC5WSGq0iVA0KZptD7DS/Ac9TUF+9m2G7SvI4TZgtmfKEI Pq0xwYrzmFuE7ng0etlbZyiRQw== X-Google-Smtp-Source: APBJJlFZnIrnb85DbXlolEcXqSZ9ISBNpMmCwvJ2f/1KXF4WPpp7g+KM77XVqaL1FubdKdLlUiXTJA== X-Received: by 2002:adf:f291:0:b0:317:636b:fcb1 with SMTP id k17-20020adff291000000b00317636bfcb1mr368348wro.27.1690499727551; Thu, 27 Jul 2023 16:15:27 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id z7-20020a5d4407000000b0031766e99429sm3176933wrq.115.2023.07.27.16.15.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Jul 2023 16:15:27 -0700 (PDT) Content-Type: text/plain; charset=us-ascii 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 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 264594efbe69 - main - Makefile.inc1: Automatically generate _LIBCOMPATS and list-old-* libcompats From: Jessica Clarke X-Priority: 5 In-Reply-To: Date: Fri, 28 Jul 2023 00:15:16 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202307270411.36R4BrmB097493@gitrepo.freebsd.org> <782afb67-124c-1ab9-9b41-129d1b9a91f8@aetern.org> <49A99144-4922-4A25-A0A5-5F0ACF97E436@freebsd.org> To: Yuri X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RBmp94sdmz42ft X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On 28 Jul 2023, at 00:12, Yuri wrote: >=20 > Jessica Clarke wrote: >> On 27 Jul 2023, at 23:33, Yuri 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 >>>> AuthorDate: 2023-07-27 04:10:43 +0000 >>>> Commit: Jessica Clarke >>>> 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. >>=20 >> 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? >=20 > Yes, delete-old-libs now properly does its job of removing lib32 = contents. Thanks for confirming; fix now pushed. Jess