Module Name: src
Committed By: riastradh
Date: Fri Nov 1 23:44:04 UTC 2024
Modified Files:
src/crypto/external/bsd/openssl/lib/engines: engines.mk
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile
src/crypto/external/bsd/openssl/lib/libssl: Makefile
Log Message:
openssl: Use VERSION_MAP, not bespoke LDFLAGS.
PR lib/58376: Missing DPADD for library version scripts
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/engines/engines.mk
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/openssl/lib/libssl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/engines/engines.mk
diff -u src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.6 src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.7
--- src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.6 Fri May 26 23:13:37 2023
+++ src/crypto/external/bsd/openssl/lib/engines/engines.mk Fri Nov 1 23:44:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: engines.mk,v 1.6 2023/05/26 23:13:37 riastradh Exp $
+# $NetBSD: engines.mk,v 1.7 2024/11/01 23:44:04 riastradh Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -26,7 +26,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.
libinstall::
.endif
-LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
+VERSION_MAP= ${LIB}.map
.include <bsd.lib.mk>
Index: src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
diff -u src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.7 src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.8
--- src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.7 Thu May 25 15:52:29 2023
+++ src/crypto/external/bsd/openssl/lib/liblegacy/Makefile Fri Nov 1 23:44:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/05/25 15:52:29 riastradh Exp $
+# $NetBSD: Makefile,v 1.8 2024/11/01 23:44:04 riastradh Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -63,7 +63,7 @@ libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.
libinstall::
.endif
-LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
+VERSION_MAP= ${LIB}.map
.if ${MKPICLIB} == "yes"
LIBDPLIBS+= common_pic ${.CURDIR}/../libcommon
Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.18 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.19
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.18 Sat May 27 20:51:22 2023
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile Fri Nov 1 23:44:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/05/27 20:51:22 hgutch Exp $
+# $NetBSD: Makefile,v 1.19 2024/11/01 23:44:04 riastradh Exp $
# RCSid:
# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -45,7 +45,7 @@ AFLAGS+=-DELF
INCS= dtls1.h ssl.h ssl2.h ssl3.h tls1.h srtp.h async.h
INCSDIR=/usr/include/openssl
-LDFLAGS+=-Wl,--version-script=${.CURDIR}/ssl.map
+VERSION_MAP= ssl.map
PKGCONFIG=libssl openssl
.include "${.CURDIR}/../../pkgconfig.mk"
