Actually enable namespaced builds in both libcrypto and libssl

(instead of commiting only one part)

2 files changed, 4 insertions, 11 deletions

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 460fd43333..a5a2c2379d 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/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/src/lib/libssl/Makefile b/src/lib/libssl/Makefile
index a2b710922d..7d3b221db9 100644
--- a/src/lib/libssl/Makefile
+++ b/src/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