From nobody Wed Apr 23 21:35:57 2025 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 4ZjXTn6Y5kz5sw6R; Wed, 23 Apr 2025 21:35:57 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZjXTn56r9z455m; Wed, 23 Apr 2025 21:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745444157; 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=d6cpnqImMOSyp018CvmGl8slrLdMxn4d1dqyPULXams=; b=U/4fgsHwqf9Ish+WyZztyhPrMEQrT+J8v4NkXp4gnxOgIs3UWc1ORTk18BsXKFB6WCnoM3 +VrG6Ig/OVP7vx4YhMcwJwxDEToH9Oy03Wl+vyh5EFQomGWzPLp2YpYAoU3VeThdK5ibzV ZJc5Wfek8AVlDvszjdpyQZ18sBfvz3pBkyipfUC3lPT73aPtJOiDmkEB8DzrbpW9jLpAJ0 5JYIIt7dDgUJbb/ioya1+WmtR8yoBWvidpCfH7doNwOxvwuWApbUYJfHMWQPwtmCNxi10l gbhm++t2/Hx0zQNfZzkpb8UU3R57N2CEw/rvNU+9GD8B2YffjkmK7ADXfx5lpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745444157; a=rsa-sha256; cv=none; b=OSMB1BWT5pwXPEyaFcofQRc4HbPzMT/2+mn99PhZobyBTrOE4hd2AZikmyfXly2z8fXJRu FdkZr1t2EN7z2UYit3aoqY2IgjP6Sw4r8NKWxG+drP2AblGvrP9blUAF0/9+tGYTr7ZKeb Vvr1K/1MS3kzZpb0j8wsw1PcO5GBGe/LQG9yFWWILjJ6EFMOZGEFXz2TZPBw1fJu9USFng 2J90Q5VZBF59RVlb04SBOIdvi/kuXR+b2VqvaShovyCkyquNwg84L4NV5Ikzn78rlzdKOe Lg3cCz01flNSXLgbaJrVXpoOg1Eh7M0bwOx3hv8n2OTz+FjgR/ILcZU3EZrY6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745444157; 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=d6cpnqImMOSyp018CvmGl8slrLdMxn4d1dqyPULXams=; b=UfCJxtEJga4dRLycWAIDHfyskaSwteEmO634udov6Ryw0s5FWKWO7PKnC2wGMnwd47Xjfk Ru4rg+fD9vla4uySqEEiWWK7UwoiuX0N3BLPEBSOfdUi2kwkZ2B75JFK5v9G67OP4nb3ks Ytkw1J+3jMaWG3TwXqJQjwEt1oCLXTEDTyOVRl27J11kicIsYjczzuzmdiJyB8BuV8qfua RXZCmlptCH+PWtJqA9PbCZqSsTQu9C+WClwJJxP7wHbK00APOj5dKqMoEq8a+UXuIPV8C1 u4pKpDZ7u6+RUQOioNh6JtPvYwObCxFFt1LhJG3SUnyHHQnYk/2icLX5+rLfCQ== 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 4ZjXTn4kVQz5W7; Wed, 23 Apr 2025 21:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53NLZvUV063967; Wed, 23 Apr 2025 21:35:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NLZvJs063964; Wed, 23 Apr 2025 21:35:57 GMT (envelope-from git) Date: Wed, 23 Apr 2025 21:35:57 GMT Message-Id: <202504232135.53NLZvJs063964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e35cc7ba3fd2 - main - edk2: Update to not build libefivar for lib32 on amd64 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e35cc7ba3fd2f9886ec7058de949b3eaf6be1a65 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e35cc7ba3fd2f9886ec7058de949b3eaf6be1a65 commit e35cc7ba3fd2f9886ec7058de949b3eaf6be1a65 Author: Warner Losh AuthorDate: 2025-04-23 21:28:20 +0000 Commit: Warner Losh CommitDate: 2025-04-23 21:28:20 +0000 edk2: Update to not build libefivar for lib32 on amd64 This dropped from the last commit because I had to redo it so many times... edk2 headers just aren't setup for the weird, hybrid enviornment we're compiling in when building i386 libraries for amd64 lib32. Since we can't use it there anyway (there's no 32-bit efibootmgr or efivar), and native i386 doesn't have them (we don't support EFI Runtime Services on i386 because we don't support EFI booting there). Sponsored by: Netflix --- lib/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Makefile b/lib/Makefile index 1f69b4208738..1924df391072 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -186,7 +186,10 @@ _libclang_rt= libclang_rt .error Requested build with sanitizers but cannot build runtime libraries! .endif +# This construct disables libefivar for 32-bit build. +.if ${MACHINE_CPUARCH} != "i386" SUBDIR.${MK_EFI}+= libefivar +.endif SUBDIR.${MK_GOOGLETEST}+= googletest SUBDIR.${MK_NETGRAPH}+= libnetgraph SUBDIR.${MK_NIS}+= libypclnt