From nobody Sun Jul 9 17:52:02 2023 X-Original-To: dev-commits-src-main@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 4QzZTH1l4Fz4mVs6; Sun, 9 Jul 2023 17:52:03 +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 4QzZTH1Ckqz3twm; Sun, 9 Jul 2023 17:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925123; 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=ymH+mh/dEsZCFfQBLJm0I3Tj17c3Tj+T+ipr9YE6zxw=; b=SmjtU7Y7dSa6YgtVec7MwWMhfNc7JhEb8hw503TUVo2roAcnZCsidbDIoMAqi9t1bmB0GE PlWa7zQ0uCHOGtvRuB/kyWl8yahAotoOSgBNk73JJgjaXKOxzFqkYeXdFqIhx832cAZMot K3yCmi3gyUIaGQYP2ggNDJJH4fS+IuQzUcPW3X1SV8qDA3ZDidNiHhY7uMMQhbdSAfvtrE 6bbDMaf5B16AswgJVHS1OiEOKzozQxG9utmU0Vmmev/42eLN4oPE3ZKNcKzgPjyK32nwfU 8Mfd96eV5Awf2ghw5Wn86AtztA4sPN/5D4aZwBkFZlV6crmpGgvpQXCR1MF7yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925123; 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=ymH+mh/dEsZCFfQBLJm0I3Tj17c3Tj+T+ipr9YE6zxw=; b=MzSQnifqzeXQxKvp1zA5pipBWOByMZwhUdjH9GGG+ajq+1KZRpT7Y6Wo8jKY6ZXPQg6a/x NGDcBepMNw3818YI7MOYPi5TbL2JRiW1cSq+T5ZCRD2McdThf5EO4WobOFhY2uF1aQS8zP SrWKtAHjaOinDRdfnTAEE5Ir34FHRSo8zJ/zdaldCs8HXyBoKgey/7m5oCtjD3sbOoDH0L 1R+vDY+wFJ60eZiJD+EsUAE/sjLmI8u3ZKH2wUjJ6ZYzSPKOeI5jJRZ1N+dISXEa6/TspX kmRZ2U4Nb8FdGj8SnGppOtsBOTVVEVYENqQs4dKv1JXqD76cTunNkoYz3tXRRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925123; a=rsa-sha256; cv=none; b=Jo2TrqAcTnew7oFfF3W14QGQ5j2JPbZOStsCJIru1Cl10suJ/z7wu7ICGHzV7niNW/Qjh9 26xYg3Unf9BD4UrBrf9A7E8OtLaBwzLZsBstZXRppWQKxN36e8Y/KjZxZAZA2f334+nYyb 7E4G5tPxj7DlaUC9F3qwberAxz4Qp6UujKqqzdbpsjIKUXP90Nyb3LyB7dGa0+RjbJnFlU 4QTT4LKY2o6p3TtKV8hhkzes0pbUeOdwGYycCZIzL1erLIww/XWThDE+K7ZpyeE1acBOmO O/MPg6BiKBSwMTTyyXv4X7+BtZ2r6VBwk4fSL/bQGD0iFc49ACSzDTYtYFfNzQ== 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 4QzZTH0Htlz1C29; Sun, 9 Jul 2023 17:52:03 +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 369Hq2I0098686; Sun, 9 Jul 2023 17:52:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq2G1098685; Sun, 9 Jul 2023 17:52:02 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:02 GMT Message-Id: <202307091752.369Hq2G1098685@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: d3748fc0c2b8 - main - include: Migrate from COMPAT_32BIT to generic COMPAT_libcompat List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: d3748fc0c2b860048cc15971e43dbb34bee8de7c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d3748fc0c2b860048cc15971e43dbb34bee8de7c commit d3748fc0c2b860048cc15971e43dbb34bee8de7c Author: Jessica Clarke AuthorDate: 2023-07-09 17:48:54 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:48:54 +0000 include: Migrate from COMPAT_32BIT to generic COMPAT_libcompat 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/D40924 --- include/paths.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/paths.h b/include/paths.h index 9af602635552..a0c3c9de6136 100644 --- a/include/paths.h +++ b/include/paths.h @@ -67,8 +67,8 @@ #define _PATH_GBDE "/sbin/gbde" #define _PATH_GELI "/sbin/geli" #define _PATH_HALT "/sbin/halt" -#ifdef COMPAT_32BIT -#define _PATH_I18NMODULE "/usr/lib32/i18n" +#ifdef COMPAT_libcompat +#define _PATH_I18NMODULE "/usr/lib" COMPAT_libcompat "/i18n" #else #define _PATH_I18NMODULE "/usr/lib/i18n" #endif