From nobody Sun Jul 9 17:52:06 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 4QzZTL6fxfz4mVxv; Sun, 9 Jul 2023 17:52:06 +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 4QzZTL4M4zz3v7M; Sun, 9 Jul 2023 17:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925126; 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=j9WSacfbN6lHh5MMccYVcJUh7Q9X8VuP2kPFzI4bCfI=; b=PLQJYlbxc4flhYofk85CaVqvCZqlY51iz1SbWLrCB45dNIEWl/8tqCdQZrFMUJnYLbWt6e LWqUIFGj9JWeX+RCEWmhyliJubPIpKcG1uic0dPKQ+COGu5V+wT1ilCQhIke1kh24pcphj 0LlKpgjuvegqzyfKGJijD6PSP/5pg2wW6jw/8SOSQYEHkVh+I0CqV0TKtQKNhRuJs5dg7d xcONMSRvNjN3o+S8z78v02s+yBmY0ddh98ZfeQmPUwS2HORb2P7jmgtOL3QPX5naNFH84c WUvYJDX1wSMO0kmT7zIX8fBT6J/HSYXGBldHEKQ1Rcxx5DvA4npHiPiH+zR7uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925126; 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=j9WSacfbN6lHh5MMccYVcJUh7Q9X8VuP2kPFzI4bCfI=; b=Q4vy7f3aEhtieWcs9DmkpaN/45y1hdyLi7D3uEMZ06QbUnS5s7R7xlyxjDJ8tRLX4A5XLe zmR1ZI1O7sL8jb6frgcHDEmgAvCk1hAHho2t3eLsRLd+bmoeCg0H6OivELgJYW++P9B6aM ZHec2UlYsszMhF0TJpAr7BHLmR9R35U8wg+udnzjoGxjsANlchFyHtmFzhCFWOnEttVZ+5 ZFSS55wd5rOp6nvUMAsDvlKBQHhZ2SaM3tfeyhg7zwJJmQ6aZC+njY3AGPj+jgEisEK4BG TVOtlF+fvuZp7lJtiZeXECOy3iStCKG51arvrvmc53AolV21Egolc0XUeUMKww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925126; a=rsa-sha256; cv=none; b=KR7VbAXv9ckWDGMMOtxSER3fiHELO1k764+g3eMFU4GiqKoGPoslcXRkA4s8bRX7CFLOgz VM4Clx9ZJn9Sxa3JPZdA5Ctk28CbmH85li4JYJoUM5IB267HGrTaQzwtH2xudDyIZfLzoZ MZCF9bME+6bHOqZ/93uF1cRigfoT1Qd29fRmRKPOuVxzvDmcodT9cs7Jj3cxFgmvdiYL83 MdDszx+XugpxC10U9gXLYS3ql3OE6vYUqE/zMF0r/sN9duHHoseLbZtqjw/kXgxPsi2Qdk YyhkfX6T0dATSLt4XPIm/Mdd6PH8cCzZgwghFWvPRIoUIk9nOldhMgr1gg/E4w== 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 4QzZTL2xLYz1Byx; Sun, 9 Jul 2023 17:52:06 +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 369Hq6nY098744; Sun, 9 Jul 2023 17:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq6Dm098743; Sun, 9 Jul 2023 17:52:06 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:06 GMT Message-Id: <202307091752.369Hq6Dm098743@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: daf2519ea2f4 - main - geom: 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: daf2519ea2f4d3a1e397188d25f7f0a5377e6521 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=daf2519ea2f4d3a1e397188d25f7f0a5377e6521 commit daf2519ea2f4d3a1e397188d25f7f0a5377e6521 Author: Jessica Clarke AuthorDate: 2023-07-09 17:49:28 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:49:28 +0000 geom: 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: imp, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40927 --- lib/geom/Makefile.classes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/geom/Makefile.classes b/lib/geom/Makefile.classes index d4e6f52e65ae..e6ac93294e1b 100644 --- a/lib/geom/Makefile.classes +++ b/lib/geom/Makefile.classes @@ -1,9 +1,9 @@ # $FreeBSD$ -.if !defined(COMPAT_32BIT) +.if !defined(COMPAT_libcompat) GEOM_CLASS_DIR?=/lib/geom .else -GEOM_CLASS_DIR?=/usr/lib32/geom +GEOM_CLASS_DIR?=/usr/lib${COMPAT_libcompat}/geom .endif GEOM_CLASSES= cache