summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto
diff options
context:
space:
mode:
authorbeck <>2024-07-09 09:39:14 +0000
committerbeck <>2024-07-09 09:39:14 +0000
commit54b6e05f31be6c330d091e640680a068cf9124fc (patch)
tree9241e2ab91bebbd04473597a6aac1057d620bd42 /src/lib/libcrypto
parentaad46278badf2512dfdf3ab62ed34e70ca66b204 (diff)
downloadopenbsd-54b6e05f31be6c330d091e640680a068cf9124fc.tar.gz
openbsd-54b6e05f31be6c330d091e640680a068cf9124fc.tar.bz2
openbsd-54b6e05f31be6c330d091e640680a068cf9124fc.zip
Actually enable namespaced builds in both libcrypto and libssl
(instead of commiting only one part)
Diffstat (limited to 'src/lib/libcrypto')
-rw-r--r--src/lib/libcrypto/Makefile9
1 files changed, 1 insertions, 8 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 @@
1# $OpenBSD: Makefile,v 1.197 2024/07/09 07:39:21 beck Exp $ 1# $OpenBSD: Makefile,v 1.198 2024/07/09 09:39:14 beck Exp $
2 2
3LIB= crypto 3LIB= crypto
4LIBREBUILD=y 4LIBREBUILD=y
@@ -745,18 +745,11 @@ includes: prereq
745 echo $$j; \ 745 echo $$j; \
746 eval "$$j"; \ 746 eval "$$j"; \
747 done; 747 done;
748.ifdef NAMESPACE
749${VERSION_SCRIPT}: ${SYMBOL_LIST} ${SYMBOL_NAMESPACE} 748${VERSION_SCRIPT}: ${SYMBOL_LIST} ${SYMBOL_NAMESPACE}
750 { printf '{\n\tglobal:\n'; \ 749 { printf '{\n\tglobal:\n'; \
751 sed '/^[._a-zA-Z]/s/$$/;/; s/^/ /' ${SYMBOL_NAMESPACE}; \ 750 sed '/^[._a-zA-Z]/s/$$/;/; s/^/ /' ${SYMBOL_NAMESPACE}; \
752 sed '/^[._a-zA-Z]/s/$$/;/; s/^/ /' ${SYMBOL_LIST}; \ 751 sed '/^[._a-zA-Z]/s/$$/;/; s/^/ /' ${SYMBOL_LIST}; \
753 printf '\n\tlocal:\n\t\t*;\n};\n'; } >$@.tmp && mv $@.tmp $@ 752 printf '\n\tlocal:\n\t\t*;\n};\n'; } >$@.tmp && mv $@.tmp $@
754.else
755${VERSION_SCRIPT}: ${SYMBOL_LIST}
756 { printf '{\n\tglobal:\n'; \
757 sed '/^[._a-zA-Z]/s/$$/;/; s/^/ /' ${SYMBOL_LIST}; \
758 printf '\n\tlocal:\n\t\t*;\n};\n'; } >$@.tmp && mv $@.tmp $@
759.endif
760 753
761# generated 754# generated
762CFLAGS+= -I${.OBJDIR} 755CFLAGS+= -I${.OBJDIR}