Date: Sun, 01 Feb 2026 00:14:56 +0000 From: Enji Cooper <ngie@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: f43d0ac1b0e2 - stable/15 - crypto/openssl: fix importing new versions from pristine trees Message-ID: <697e9b00.1f890.5edf47e0@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=f43d0ac1b0e29bbd77d6b0b1c87dca075cd7b9bf commit f43d0ac1b0e29bbd77d6b0b1c87dca075cd7b9bf Author: Enji Cooper <ngie@FreeBSD.org> AuthorDate: 2025-09-17 05:57:32 +0000 Commit: Enji Cooper <ngie@FreeBSD.org> 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 \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?697e9b00.1f890.5edf47e0>