summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/Makefile9
-rw-r--r--src/lib/libssl/Makefile6
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 @@
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}
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 @@
1# $OpenBSD: Makefile,v 1.82 2024/06/25 14:10:45 jsing Exp $ 1# $OpenBSD: Makefile,v 1.83 2024/07/09 09:39:14 beck Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.ifndef NOMAN 4.ifndef NOMAN
@@ -16,9 +16,9 @@ CFLAGS+= -Wall -Wundef
16CFLAGS+= -Werror -Wshadow 16CFLAGS+= -Werror -Wshadow
17.endif 17.endif
18CFLAGS+= -DLIBRESSL_INTERNAL 18CFLAGS+= -DLIBRESSL_INTERNAL
19.ifdef NAMESPACE 19
20CFLAGS+= -DLIBRESSL_NAMESPACE 20CFLAGS+= -DLIBRESSL_NAMESPACE
21.endif 21
22.ifdef TLS1_3_DEBUG 22.ifdef TLS1_3_DEBUG
23CFLAGS+= -DTLS13_DEBUG 23CFLAGS+= -DTLS13_DEBUG
24.endif 24.endif