From nobody Sun Feb 1 00:14:56 2026 X-Original-To: dev-commits-src-branches@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 4f3Vcd0mKGz6QnDF for ; Sun, 01 Feb 2026 00:14: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f3Vcd03GNz3sc2 for ; Sun, 01 Feb 2026 00:14:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769904897; 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=qxlFcZkBiP/Car7QpimzYcdUm+0UMDDPZVKFCTxm9tI=; b=iUCrvqxnvgintD53VC6iDWpYBAAB6Ow+81TCnMEZzrxHQELZt2saEaAQ9GkisKw2MDWl38 CsixnO2e563cjuJI9sweC893mhFbZ5XTYcaSgeZ8mmecT1bjNnPdtAhqgny+Vy6BiVIBY+ UNRBUepLTlovWGBpSlEX53RGhXbIwAWcvhTWhUaPvPnrZ2eI/mUfr7TVMgxnPSPwQIU+7x /nc9fLZTdUX+pyRk4gpw8HiTw75s1uKyf2S2mQpHp7iG2ZXrHyPhRrIFNPerEU0yKnsctV XZJXDHWA68Upob45KSJ27R5XQQkIVJEyPwWmWPRu6dVpsT/Wo38qpHXl9tIVvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769904897; a=rsa-sha256; cv=none; b=XBgdHz6Qvdy6bs0W8iWfb1maJzLoKo/I536FHpVWDdnojhrXrhDSRsl0y1iVWMFGzlLSTI i1yn7pwGvYTptZ94VMmtmlNRbkRzA81wPxLkEvFgx8MG9XS9KPMBl0WSca99yOiArJzQCw J9XWDjM7F9L9DtmF4i3Job+5trtk9mLRJnRHtmmtQJwnqtS4Ow/W2d/6SZqPlh0LHsFGBf jRmVSGi+sSFcip9PtGDsFNIW4CUzorvfHlEzWMwrx2HuC7TGQtwnK4HL9g5NFVrotUnNng Dxf59zSlQUszdQNmQItKOlzC68Ds/dw+2uTKLDfOmyZrfklw1BWIJpHyuaCiBw== 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=1769904897; 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=qxlFcZkBiP/Car7QpimzYcdUm+0UMDDPZVKFCTxm9tI=; b=VqBkmQQD8eNXdh1sAByWBP6matG5qTF67G4A0tYtWci1R6z4DFSpye4eurfML/Mab7TxX9 O0N9uiGaLTbzF3YjO5BWCLtDhuFNoxQ0AwrYUecOZ0ZFKQusk/1SX130nqt9IGP1JecalO bexBkXiFtjWzFkcbPI5Nh56soYczpRUnztlgcmwp0kRohOWEQI9plXAJKZNTsTau/Pj8fa lnvOpjspHDFFROCmQgoSnbkaUWpVA8hJH8xu/uU7dEMHYEYuLkIkbi7hWhZ/BqTgBK4on6 L/nfzh1IS7uawiD1Hz1Zph5hRtSUviUIcjl5WLGcBGFahKMje3vA9PjOB2cDSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3Vcc6c4mz1Zx for ; Sun, 01 Feb 2026 00:14:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f890 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Feb 2026 00:14:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: f43d0ac1b0e2 - stable/15 - crypto/openssl: fix importing new versions from pristine trees List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: f43d0ac1b0e29bbd77d6b0b1c87dca075cd7b9bf Auto-Submitted: auto-generated Date: Sun, 01 Feb 2026 00:14:56 +0000 Message-Id: <697e9b00.1f890.5edf47e0@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=f43d0ac1b0e29bbd77d6b0b1c87dca075cd7b9bf commit f43d0ac1b0e29bbd77d6b0b1c87dca075cd7b9bf Author: Enji Cooper AuthorDate: 2025-09-17 05:57:32 +0000 Commit: Enji Cooper CommitDate: 2026-02-01 00:14:42 +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 (cherry picked from commit 52c4b76d1dd385fbe33b78172e39a10749b83d13) --- crypto/openssl/BSDmakefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crypto/openssl/BSDmakefile b/crypto/openssl/BSDmakefile index c6b539be0432..a45dc2b532f3 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 \