Module Name: src
Committed By: riastradh
Date: Thu Nov 21 20:14:07 UTC 2024
Modified Files:
src/tests/lib/libarchive: Makefile
Log Message:
tests/lib/libarchive: Link against libarchive statically.
The tests reach into libarchive guts, so they don't work with only
the public symbols, which are all that libarchive.so exports now.
PR lib/58829: libarchive exports excess symbols
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/tests/lib/libarchive/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libarchive/Makefile
diff -u src/tests/lib/libarchive/Makefile:1.15 src/tests/lib/libarchive/Makefile:1.16
--- src/tests/lib/libarchive/Makefile:1.15 Wed Nov 13 03:38:51 2024
+++ src/tests/lib/libarchive/Makefile Thu Nov 21 20:14:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/11/13 03:38:51 riastradh Exp $
+# $NetBSD: Makefile,v 1.16 2024/11/21 20:14:07 riastradh Exp $
NOMAN=
@@ -18,7 +18,8 @@ CPPFLAGS+=-I${LIBARCHIVE}/libarchive/tes
DPADD+= ${LIBARCHIVE} ${LIBEXPAT} ${LIBBZ2} ${LIBLZMA} ${LIBZ} \
${LIBCRYPTO} ${LIBPTHREAD}
-LDADD+= -larchive -lexpat -lbz2 -llzma -lz -lcrypto -lpthread
+LDADD+= -Wl,--push-state,-Bstatic,-larchive,--pop-state # uses libarchive guts
+LDADD+= -lexpat -lbz2 -llzma -lz -lcrypto -lpthread
.include "${NETBSDSRCDIR}/external/bsd/zstd/Makefile.zstd"
PROGDPLIBS+= ${ZSTDDPLIBS} # needed by libarchive
