From nobody Sun Jul 09 17:52:09 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 4QzZTf66PYz4mVdt; Sun, 9 Jul 2023 17:52:10 +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 4QzZTQ172Hz3tsX; Sun, 9 Jul 2023 17:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925130; 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=ieQV7/cMStoBXXP1CyuMzoT+gI8MOfRSUDkOG825AzM=; b=wnURqzIsvpPfjCEsADaNzJvmxpRhPAL5bvWj0A8hlSue3exekOZpn0iiz8AcvgOFAlGU8J 0nHmMhzJ6dpYlEft1ZqSlXWZ0tTTKeFi0VAb7jgyatAdE+hbZaHHiCr87fel9Dtc9B5dcs 2WsSWd14+nhhmy1VYqkkGL/sCcnqGaCGWiyXi2EGrAA32cDsQKU0ceYPXXHNzJZ5mUj4BL prtKfqnp/qU0r6yyI4ssFd5iGM7PHnVfQIp6d41mFSwsJpRdfsjB0bI1vXIJEF+PG04hZ/ Y8o7xoMbR3jArVpSuFgbM4/utJpsS5oBbf3fSwIACFYSU9sO0vf7nRcNnyxz+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925130; 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=ieQV7/cMStoBXXP1CyuMzoT+gI8MOfRSUDkOG825AzM=; b=DAgYRIOW7kYlsYCYM89v9JcJ+IaULcc+Sk22QirI8dz4l4uKzVNxo+HqqGP9+VqiB4/bsw fwA3P5BGzA4rmXChfD5fG1i6TVRL4YLivFJMbr4Zo1rQDowc6w26wF8Ew2RSSOF33Pe+JR 9pq8oEtlKKxxUfAg90e/NiX3/N1N+2KDzQP7cbbuIz02H2QdfMzDh0SrGbXmvK0nNAz9Ra q/QWfC420+qOW6qyVGTLK/KjR7EiRp0II0d9aBCI9KIy6bTmdD6srenqCSFt/Nd0Vhe4fT p5hhJYOBC0qTjd2UlY+mI1Mz/bbDQ+M+A5Q1AmlZNlpxrllfC2pJYVNVvJ1vKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925130; a=rsa-sha256; cv=none; b=a+C4lDBpWOQ7y8AX4sUhZRFbPzAeda56Jc9oCc8ZCNAnfLDo+zxeefLCFkmNyrir0YtIYc 6oJKuuTSamEVX9SUnEzQjuVlX6QJPafhHZMRbvWrCOU6azZ6tLvw9a7suF/CgswUtGgfsy 3Ngfj4lMZWLZg8bMDULklrS/3MgJpNVryoEBhz2X298RRfq2eBw7fUV/JDFR5yqPwepB0L 1iGF39CPRDKX5o+Fe3xzfz05J4ELEy5vW946CFQrfYlvo/FSw0p07nwbDKgJWRa8patb4w 1jW4CFrkDnRnNzl+hhdatu28kmpcEesv7jiwKT1yh4Xl/rUaWSgCdRwgg5FVBQ== 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 4QzZTP5P5Vz1C00; Sun, 9 Jul 2023 17:52:09 +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 369Hq9VB098808; Sun, 9 Jul 2023 17:52:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq9T7098807; Sun, 9 Jul 2023 17:52:09 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:09 GMT Message-Id: <202307091752.369Hq9T7098807@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: 3864bd4fd217 - main - lib: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT 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: 3864bd4fd217f46e4c9126ca2c48db96c44682ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3864bd4fd217f46e4c9126ca2c48db96c44682ef commit 3864bd4fd217f46e4c9126ca2c48db96c44682ef Author: Jessica Clarke AuthorDate: 2023-07-09 17:49:53 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:49:53 +0000 lib: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT In the process, delete a COMPAT_SOFTFP remnant that was missed in previous sweeps. See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: emaste, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40931 --- lib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index d82fca7c5c69..47ff3cec7ebf 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -148,7 +148,7 @@ SUBDIR_DEPEND_libpcap= ofed .endif SUBDIR_DEPEND_nss_tacplus= libtacplus -.if !defined(COMPAT_32BIT) +.if !defined(COMPAT_LIBCOMPAT) SUBDIR+= flua SUBDIR_DEPEND_flua= libjail .endif @@ -160,7 +160,7 @@ SUBDIR.${MK_BLACKLIST}+=libblacklist SUBDIR.${MK_BLUETOOTH}+=libbluetooth libsdp SUBDIR.${MK_BSNMP}+= libbsnmp -.if !defined(COMPAT_32BIT) && !defined(COMPAT_SOFTFP) +.if !defined(COMPAT_LIBCOMPAT) .if ${MK_CLANG} != "no" || ${MK_LLD} != "no" || \ ${MK_LLDB} != "no" || ${MK_LLVM_BINUTILS} != "no" SUBDIR+= clang