From: beck <beck@openbsd.org>
Date: Tue, 9 Jul 2024 09:39:14 +0000 (+0000)
Subject: Actually enable namespaced builds in both libcrypto and libssl
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=35058f2b19effcc21f3a702b2a2403ceb98d7e71;p=openbsd

Actually enable namespaced builds in both libcrypto and libssl

(instead of commiting only one part)
---

diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 460fd43333f..a5a2c2379d5 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.197 2024/07/09 07:39:21 beck Exp $
+# $OpenBSD: Makefile,v 1.198 2024/07/09 09:39:14 beck Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -745,18 +745,11 @@ includes: prereq
 	    echo $$j; \
 	    eval "$$j"; \
 	done;
-.ifdef NAMESPACE
 ${VERSION_SCRIPT}: ${SYMBOL_LIST} ${SYMBOL_NAMESPACE}
 	{ printf '{\n\tglobal:\n'; \
 	  sed '/^[._a-zA-Z]/s/$$/;/; s/^/		/' ${SYMBOL_NAMESPACE}; \
 	  sed '/^[._a-zA-Z]/s/$$/;/; s/^/		/' ${SYMBOL_LIST}; \
 	  printf '\n\tlocal:\n\t\t*;\n};\n'; } >$@.tmp && mv $@.tmp $@
-.else
-${VERSION_SCRIPT}: ${SYMBOL_LIST}
-	{ printf '{\n\tglobal:\n'; \
-	  sed '/^[._a-zA-Z]/s/$$/;/; s/^/		/' ${SYMBOL_LIST}; \
-	  printf '\n\tlocal:\n\t\t*;\n};\n'; } >$@.tmp && mv $@.tmp $@
-.endif
 
 # generated
 CFLAGS+= -I${.OBJDIR}
diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile
index a2b710922d7..7d3b221db9a 100644
--- a/lib/libssl/Makefile
+++ b/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.82 2024/06/25 14:10:45 jsing Exp $
+# $OpenBSD: Makefile,v 1.83 2024/07/09 09:39:14 beck Exp $
 
 .include <bsd.own.mk>
 .ifndef NOMAN
@@ -16,9 +16,9 @@ CFLAGS+= -Wall -Wundef
 CFLAGS+= -Werror -Wshadow
 .endif
 CFLAGS+= -DLIBRESSL_INTERNAL
-.ifdef NAMESPACE
+
 CFLAGS+= -DLIBRESSL_NAMESPACE
-.endif
+
 .ifdef TLS1_3_DEBUG
 CFLAGS+= -DTLS13_DEBUG
 .endif