From nobody Sun Sep 21 22:36:41 2025 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 4cVLh96CJMz685kg; Sun, 21 Sep 2025 22:36:41 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cVLh95VZ4z3nW5; Sun, 21 Sep 2025 22:36:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758494201; 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=BewbwyR0DlqH2sCug3Q1V8YM2tyS2vm2BKcfDRRJc94=; b=C1qf44mAOARUlNyEzhSQDbQiD7Nkj0o72mvIkrMCFxpDMRZXpY8QrqJ1aOY/nnIuOYNZOA hYVcpATnOz50E7k2Uc/38Xf+ed5993JFTbLFExxctx2zWiMrEmt7GyWGRma2U1FygW4AHn PM1fYJxHjQ6e+P28R4rokqchN7teOjsjs56QeFhAyQDsmIqQwMK0wp5uX+rR897yIv1HfK Z/QLjO40MOcSobenRhiXo4KlPn3UCrfzBrQVKjE28gdv17fJr01+tylC5AVNnMXmJ1Sz4z v9kn4I4zkr7jRhSGUGMM+SF95gT6TY7GEH5XMF3xi4/JkYnfA00eykRmJZuZBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758494201; 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=BewbwyR0DlqH2sCug3Q1V8YM2tyS2vm2BKcfDRRJc94=; b=Ll9CwF0NS+SfL+puBypckpG/miqXaJ0WWZmb9C2SUvEcGwJiFupZgiHSgDb1OxG4cUhG1J BAW8AyAOioP+ECtL6wYYUpzrSSaT8YYQWHDNHwUYf3obxIeUMlqNN/QkLEnJziFXlaSr3C xe4l4ha73ivXCX9NOeElz4QqSDFOJu0YGud0p7iqjJeGTuP0a8SBNH5kh23JxLsZu83xHt BQLFQYeLQDz8eumquGH45j1YYJf0ljXHobRhWuHUDzgRgUFkAMQ/BC7csjXw+8evKG1bA2 mrJBq4u//gQxDEQNpM9hwMU9QkcSUJYPMJpAuDXTl+BydMVYhpXbt9Xhxk0HPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758494201; a=rsa-sha256; cv=none; b=I/+VtbMwNZAct+bA+pjwykjXu/yqqDWETILZG0sz0k55S1sW20ZfkiovTt1j9xCcW6ipeS edtgBycPGLxtDByORpeO7R5RtSJFT0zG0HAMda+DtyDl1Wluk/hGnzE3GysLcuP99xkLda hV2nDkvIGxbYL2+ZtTppxxQ0Y6DZFoa8bed9e/JRJhyTxeIK+oEB+nfzjI1W1YWptqTkTh dU1I/h1oXaiQoL9hUE2XDjoA13XMwbIrR3gh3P/NXgwQF1HkbvJyglQ/w5trVH6eGlhF0F 0CAYe5P3xbFuOYK+1ky8MSlIGZmdZCAK2U4a7U+FlIUJ4Vepe42DlVW5ppPGOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cVLh94gsdzYr9; Sun, 21 Sep 2025 22:36:41 +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 58LMafS0081717; Sun, 21 Sep 2025 22:36:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58LMafnt081714; Sun, 21 Sep 2025 22:36:41 GMT (envelope-from git) Date: Sun, 21 Sep 2025 22:36:41 GMT Message-Id: <202509212236.58LMafnt081714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 52c4b76d1dd3 - main - crypto/openssl: fix importing new versions from pristine trees 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52c4b76d1dd385fbe33b78172e39a10749b83d13 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=52c4b76d1dd385fbe33b78172e39a10749b83d13 commit 52c4b76d1dd385fbe33b78172e39a10749b83d13 Author: Enji Cooper AuthorDate: 2025-09-17 05:57:32 +0000 Commit: Enji Cooper CommitDate: 2025-09-21 22:36:24 +0000 crypto/openssl: fix importing new versions from pristine trees Prior to this change, CC was not being passed through to Configure, which was resulting in failures when Configure was running compiler checks. Pass through CC via `WRK_ENV` to Configure so the compiler is defined properly as part of the initial build. MFC after: 1 month Fixes: d18058b7b850 ("crypto/openssl: apply polish to new vendor import process") Differential Revision: https://reviews.freebsd.org/D52595 --- crypto/openssl/BSDmakefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crypto/openssl/BSDmakefile b/crypto/openssl/BSDmakefile index 514c87ae3a8e..d260808ffac3 100644 --- a/crypto/openssl/BSDmakefile +++ b/crypto/openssl/BSDmakefile @@ -12,7 +12,9 @@ LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc CAT?= /bin/cat +CC?= cc GMAKE?= gmake +LD?= ld MV?= /bin/mv PERL?= perl SETENVI= /usr/bin/env -i @@ -26,10 +28,13 @@ CONFIGURATION_H_ORIG= ${CONFIGURATION_H}.orig .ORDER: configure patch all LOCALBASE= /usr/local -WRK_ENV= PATH=${LOCALBASE}/bin:/bin:/usr/bin +WRK_ENV= CC=${CC} \ + LD=${LD} \ + PATH=${LOCALBASE}/bin:/bin:/usr/bin configure: @(cd ${.CURDIR} && ${SETENVI} \ + ${WRK_ENV} \ ${PERL} ./Configure \ disable-aria \ disable-egd \