From nobody Thu Jul 27 04:11:53 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 4RBHQd3mPGz4pQ9V; Thu, 27 Jul 2023 04:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RBHQd2qtQz3nHG; Thu, 27 Jul 2023 04:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TK9+tMPIxROl+VMIt03zaZn91GsKwfNd40195B/c6ck=; b=Umy5l2Rqn6acGSESFXMvu/RvBCHgcl3RvVTC047xTnEuNFmpIu1AOMArtYErTAk91+be+/ RO9FGHLpJgDW5G2KIbNdsjOok+Lv+xnK2KKWYFoklkzxi9/rJ5ekqWR1+Mi9JQXfB4HMvH eyx86ibLoXWcjbnj5K3enWx+Mdir/91Vpyp61HryVMpnVkrEPk0kV/NJMo0pdac8oITN5p TSXrSpUcV9ePdaUStCEefN2fibjvmrcijfwefUz+x101La++HhvCG5i7tGtcZYGKgSveNo dFRXfEgixnZvzajVWQEa7fKBUYVWyXApqxgIhVZLZmf0hZ3tRrzb6bCAOCMc9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TK9+tMPIxROl+VMIt03zaZn91GsKwfNd40195B/c6ck=; b=N0NZUQIJPMA/3FhoEw6NTucxZuIbO6XWqnDsaSej+M17dDWt2NRqjhC1duRO5PZ4MRUSbY Uf2tt0rhUoGG61dIgntDIAOVxbdFF03+A3EYUax7YmrSWZIe3qFVJEh24bvdleo9jrwTxs MejHQ7vpXowIIfm0e2/JO4W/6UGL8AAIxlEtLzz1F/dQrV0twOIIAOtjuAXyWUkpMU4YE0 VT1egdmCiezU+n6gaRROw4xe6gk6cIHtS5cXB2ZrOslPm3FX0/WOtLDIdLRL25Rp49eYNk jCdqxjPjujYqnSllHrog1vJqJVgDgtDEAzu46eU0+UR8vSqh145yiMdzCl3ONg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690431113; a=rsa-sha256; cv=none; b=fTcWbVw9G/5o6Qan4GmJN/oGLk7b5cAQH+HY06bXQ4gMaqGCVyAllcG4m8mHalnD3etb8v Sm/nqsFMqBEHXcHT33wtZBMoJe7CkkIa4TCBO+k0Jwyk7U/1rTOoa+ES3WkU0EWrBZp5Lt ke6c7Q7oSlFZqP6ogbd8fLzBtDfuVAO/JK7LoOc57/gLTtzKrKST06m1iMvgTc1Ak3kgm0 O0xRGqSwQtAP0ZH0z1yn21srogVKe0oAlnid/JjysgbEEjBKn+vK23uL1R2D8LRsQgSkoL h80etbWW+Em7xwXuezNEhM1zEAWpYUsPJBZf62OFK+yNQrqEVP/KuQ9uw9Keag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RBHQd1Wgtz19DW; Thu, 27 Jul 2023 04:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36R4Brj0097494; Thu, 27 Jul 2023 04:11:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36R4BrmB097493; Thu, 27 Jul 2023 04:11:53 GMT (envelope-from git) Date: Thu, 27 Jul 2023 04:11:53 GMT Message-Id: <202307270411.36R4BrmB097493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 264594efbe69 - main - Makefile.inc1: Automatically generate _LIBCOMPATS and list-old-* libcompats 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 264594efbe699defbe2ac4e1d7a91fde3db45e8f Auto-Submitted: auto-generated 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 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"@} | \ + ${_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"