From nobody Thu Jul 27 04:11:59 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 4RBHQm5tQcz4pQNt; Thu, 27 Jul 2023 04:12:00 +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 4RBHQm1M9Lz3nPh; Thu, 27 Jul 2023 04:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431120; 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=6CCrgVjYPzsHdhysKUo3mQwwVdmy6UCTEnL3Cta1xk4=; b=VZwQfTx4TUsaMpgpcthpHQ7+gLGEGGbfXk9RLKwO6zqGybqvtV8AHZrVZ9yJjT7C2oFUfb m19aK537cHEBw+E+oz6vm+CKNKnwhAxsJGk52hZQDLAdkBA91IvS3PT6ub11YK28RLlczN 7x/WI5FQcTPa+PYO+foJC56Nj+cByafCTPdyWOaypw2X/N8cHE+pMopOKbmrSDAmp9zPMR OcNF7NKdhFJxfAJHm2tlSFHbSEpBl0v6gDEYkGW+YwXOw5tdNKr3AtnzEn1g/A5VuVXRPi CuUeR6VX7MNkZIf/W2nG4NjeeuKQCu5UPkSQJSorNr4LS5zMvdR+L7gnKs970g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431120; 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=6CCrgVjYPzsHdhysKUo3mQwwVdmy6UCTEnL3Cta1xk4=; b=nZXuVvliSn/bDnGL2bBM+0KILQWOJUNe2jaD/wXTcFR0FsdvyS0hpXU6S8z/rLa19lxGI1 4fhQ2WnK5lpMOqjx1oWIW2ryL9DHlvst1NTWwpUkoEr5dIL9HGDhaLDoAWaPDEu1vkylll GxXi7ndbUZYMcJamWMD6QeJXkK8IgxZgQMFOBcZo+dee6Ebq7XuKU57Qc1ifV4tlHa+Tiz Ya8wlZhoY6EDb1TtMXEe+kF4ohnCvH2QnwnDq1YlQnG2EPGXTQ9Gl48f/jcEsjTZ6l+OCe TZRX3akXimXdVuYILXGKd0qVjMCWouh01jKSnJ3UpbT4D0KYr5jbFTRGvwfgxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690431120; a=rsa-sha256; cv=none; b=NzpCX21ArCrWWHeGcQnokfF2wWcueNDj4D+R4yMEUvPge/4suiu2gJiFzjDM8xyjU0rba/ e7Ic8xzx5le4etF3gyIjKoi9jBMYmzhGQuwqrykq7eXTTKCU04Lh11z/wXKaf9fM31SA4y +iZ1VCGHfoBL2qP+CHIWK8ZDoOMu+Vxr/Lbc28rnm5mssHMQWMWt+fpFiNwsWG+95n82zN bXuA/vINQja3y7a9VrZMYf1MNz1QCD2Beo9pz0Vt/Aj/mXhenyBn5CP4aNAu89SBsVw+5D 6fPOEsHSzrrCYhf8x8h0XUQxDSK1Jtcivh4QIrl6LTj1myMAVMFOkgoLp5Xj0w== 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 4RBHQm0C8Xz191J; Thu, 27 Jul 2023 04:12:00 +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 36R4Bx0m097621; Thu, 27 Jul 2023 04:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36R4Bxx8097620; Thu, 27 Jul 2023 04:11:59 GMT (envelope-from git) Date: Thu, 27 Jul 2023 04:11:59 GMT Message-Id: <202307270411.36R4Bxx8097620@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: 64140bb529ea - main - OptionalObsoleteFiles.inc: Automatically generate libcompat directories 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: 64140bb529eaaebd3cb972deb3d03eae1320d265 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=64140bb529eaaebd3cb972deb3d03eae1320d265 commit 64140bb529eaaebd3cb972deb3d03eae1320d265 Author: Jessica Clarke AuthorDate: 2023-07-27 04:10:46 +0000 Commit: Jessica Clarke CommitDate: 2023-07-27 04:10:46 +0000 OptionalObsoleteFiles.inc: Automatically generate libcompat directories Reviewed by: brooks, jhb, emaste Differential Revision: https://reviews.freebsd.org/D41186 --- tools/build/mk/OptionalObsoleteFiles.inc | 46 +++++++++++++++++--------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 2d03822ffaaf..783e75e5b4c3 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1017,7 +1017,9 @@ OLD_FILES+=usr/share/dtrace/tcptrack OLD_FILES+=usr/share/dtrace/udptrack OLD_FILES+=usr/share/man/man1/dtrace.1.gz OLD_DIRS+=usr/lib/dtrace -OLD_DIRS+=usr/lib32/dtrace +. for libcompat in ${_ALL_libcompats} +OLD_DIRS+=usr/lib${libcompat}/dtrace +. endfor OLD_DIRS+=usr/libexec/dwatch OLD_DIRS+=usr/share/dtrace/toolkit OLD_DIRS+=usr/share/dtrace @@ -3677,34 +3679,36 @@ OLD_FILES+=usr/share/man/man5/keymap.5.gz OLD_FILES+=usr/share/man/man8/moused.8.gz .endif -.if ${MK_LIB32} == no -OLD_FILES+=etc/mtree/BSD.lib32.dist -OLD_FILES+=libexec/ld-elf32.so.1 -. if exists(${DESTDIR}/usr/lib32) -LIB32_DIRS!=find ${DESTDIR}/usr/lib32 -type d \ +.for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats} +. if ${MK_LIB${LIBCOMPAT}} == no +OLD_FILES+=etc/mtree/BSD.lib${libcompat}.dist +OLD_FILES+=libexec/ld-elf${libcompat}.so.1 +. if exists(${DESTDIR}/usr/lib${libcompat}) +LIB${LIBCOMPAT}_DIRS!=find ${DESTDIR}/usr/lib${libcompat} -type d \ | sed -e 's,^${DESTDIR}/,,'; echo -LIB32_FILES!=find ${DESTDIR}/usr/lib32 \! -type d \ +LIB${LIBCOMPAT}_FILES!=find ${DESTDIR}/usr/lib${libcompat} \! -type d \ \! -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo -LIB32_LIBS!=find ${DESTDIR}/usr/lib32 \! -type d \ +LIB${LIBCOMPAT}_LIBS!=find ${DESTDIR}/usr/lib${libcompat} \! -type d \ -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo -OLD_DIRS+=${LIB32_DIRS} -OLD_FILES+=${LIB32_FILES} -OLD_LIBS+=${LIB32_LIBS} -. endif -. if ${MK_DEBUG_FILES} == no -. if exists(${DESTDIR}/usr/lib/debug/usr/lib32) -DEBUG_LIB32_DIRS!=find ${DESTDIR}/usr/lib/debug/usr/lib32 -type d \ +OLD_DIRS+=${LIB${LIBCOMPAT}_DIRS} +OLD_FILES+=${LIB${LIBCOMPAT}_FILES} +OLD_LIBS+=${LIB${LIBCOMPAT}_LIBS} +. endif +. if ${MK_DEBUG_FILES} == no +. if exists(${DESTDIR}/usr/lib/debug/usr/lib${libcompat}) +DEBUG_LIB${LIBCOMPAT}_DIRS!=find ${DESTDIR}/usr/lib/debug/usr/lib${libcompat} -type d \ | sed -e 's,^${DESTDIR}/,,'; echo -DEBUG_LIB32_FILES!=find ${DESTDIR}/usr/lib/debug/usr/lib32 \! -type d \ +DEBUG_LIB${LIBCOMPAT}_FILES!=find ${DESTDIR}/usr/lib/debug/usr/lib${libcompat} \! -type d \ \! -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo -DEBUG_LIB32_LIBS!=find ${DESTDIR}/usr/lib/debug/usr/lib32 \! -type d \ +DEBUG_LIB${LIBCOMPAT}_LIBS!=find ${DESTDIR}/usr/lib/debug/usr/lib${libcompat} \! -type d \ -name "lib*.so*" | sed -e 's,^${DESTDIR}/,,'; echo -OLD_DIRS+=${DEBUG_LIB32_DIRS} -OLD_FILES+=${DEBUG_LIB32_FILES} -OLD_LIBS+=${DEBUG_LIB32_LIBS} +OLD_DIRS+=${DEBUG_LIB${LIBCOMPAT}_DIRS} +OLD_FILES+=${DEBUG_LIB${LIBCOMPAT}_FILES} +OLD_LIBS+=${DEBUG_LIB${LIBCOMPAT}_LIBS} +. endif . endif -. endif .endif +.endfor # LIBCOMPAT libcompat .if ${MK_LLD} == no OLD_FILES+=usr/bin/ld.lld