The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=407c4d1eeb80caadcf24e60b827ea6686d3adf3a
commit 407c4d1eeb80caadcf24e60b827ea6686d3adf3a
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-09-04 13:28:39 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-09-04 13:28:39 +0000
openssl: Disable KTLS in bootstrap libraries
We need to build OpenSSL when bootstrapping certctl. On MacOS
ktls_enable() isn't defined anywhere, so without this the build fails.
We don't need KTLS in the bootstrap library, so just disable it.
Reviewed by: khorben, ngie
Differential Revision: https://reviews.freebsd.org/D52341
---
secure/lib/libcrypto/Makefile | 3 ++-
secure/lib/libssl/Makefile | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index f8f8d291ee9e..75ebb6e65327 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -649,10 +649,11 @@ _cmd1=/%%NO_ASM%%/d
.else
_cmd1=s/%%NO_ASM%%//
.endif
-.if ${MK_OPENSSL_KTLS} != "no"
+.if ${MK_OPENSSL_KTLS} != "no" && !defined(BOOTSTRAPPING)
_cmd2=/%%NO_KTLS%%/d
.else
_cmd2=s/%%NO_KTLS%%//
+CFLAGS+= -DOPENSSL_NO_KTLS
.endif
buildinf.h: Makefile
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index acb63549c1c8..b0ca31644279 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -70,7 +70,7 @@ SRSC+= tls_pad.c
SRCS+= poll_immediate.c
SRCS+= rio_notifier.c poll_builder.c
-.if ${MK_OPENSSL_KTLS} == "no"
+.if ${MK_OPENSSL_KTLS} == "no" || defined(BOOTSTRAPPING)
CFLAGS+=-DOPENSSL_NO_KTLS
.else
SRCS+= ktls_meth.c
