Module Name: src
Committed By: christos
Date: Sun Jan 19 17:36:57 UTC 2020
Modified Files:
src/tests/lib/libarchive: Makefile
src/tests/usr.bin/cpio: Makefile
src/tests/usr.bin/tar: Makefile
Log Message:
Fix static linking (sun2)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libarchive/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/cpio/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/tar/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.3 src/tests/lib/libarchive/Makefile:1.4
--- src/tests/lib/libarchive/Makefile:1.3 Sat Jan 18 10:16:47 2020
+++ src/tests/lib/libarchive/Makefile Sun Jan 19 12:36:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/01/18 15:16:47 christos Exp $
+# $NetBSD: Makefile,v 1.4 2020/01/19 17:36:57 christos Exp $
NOMAN=
@@ -16,9 +16,9 @@ CPPFLAGS+=-I${LIBARCHIVE}/libarchive/tes
.PATH: ${LIBARCHIVE}/libarchive/test ${LIBARCHIVE}/test_utils
-LDADD+=-larchive
-DPADD+=${LIBARCHIVE}
-
+DPADD+= ${LIBARCHIVE} ${LIBEXPAT} ${LIBBZ2} ${LIBLZMA} ${LIBZ} \
+ ${LIBCRYPTO} ${LIBPTHREAD}
+LDADD+= -larchive -lexpat -lbz2 -llzma -lz -lcrypto -lpthread
SRCS.h_libarchive= \
test_main.c \
Index: src/tests/usr.bin/cpio/Makefile
diff -u src/tests/usr.bin/cpio/Makefile:1.3 src/tests/usr.bin/cpio/Makefile:1.4
--- src/tests/usr.bin/cpio/Makefile:1.3 Sat Jan 18 10:16:48 2020
+++ src/tests/usr.bin/cpio/Makefile Sun Jan 19 12:36:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/01/18 15:16:48 christos Exp $
+# $NetBSD: Makefile,v 1.4 2020/01/19 17:36:57 christos Exp $
NOMAN=
@@ -19,10 +19,9 @@ CPPFLAGS+=-DPLATFORM_CONFIG_H='"config_n
.PATH: ${LIBARCHIVE}/cpio/test ${LIBARCHIVE}/test_utils ${LIBARCHIVE}/cpio \
${LIBARCHIVE}/libarchive_fe
-
-LDADD+=-larchive
-DPADD+=${LIBARCHIVE}
-
+DPADD+= ${LIBARCHIVE} ${LIBEXPAT} ${LIBBZ2} ${LIBLZMA} ${LIBZ} \
+ ${LIBCRYPTO} ${LIBPTHREAD}
+LDADD+= -larchive -lexpat -lbz2 -llzma -lz -lcrypto -lpthread
SRCS.h_cpio= \
test_main.c \
Index: src/tests/usr.bin/tar/Makefile
diff -u src/tests/usr.bin/tar/Makefile:1.3 src/tests/usr.bin/tar/Makefile:1.4
--- src/tests/usr.bin/tar/Makefile:1.3 Sat Jan 18 10:16:48 2020
+++ src/tests/usr.bin/tar/Makefile Sun Jan 19 12:36:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/01/18 15:16:48 christos Exp $
+# $NetBSD: Makefile,v 1.4 2020/01/19 17:36:57 christos Exp $
NOMAN=
@@ -17,9 +17,9 @@ CPPFLAGS+=-I${LIBARCHIVE}/libarchive
.PATH: ${LIBARCHIVE}/tar/test ${LIBARCHIVE}/test_utils
-LDADD+=-larchive
-DPADD+=${LIBARCHIVE}
-
+DPADD+= ${LIBARCHIVE} ${LIBEXPAT} ${LIBBZ2} ${LIBLZMA} ${LIBZ} \
+ ${LIBCRYPTO} ${LIBPTHREAD}
+LDADD+= -larchive -lexpat -lbz2 -llzma -lz -lcrypto -lpthread
SRCS.h_tar= \
test_main.c \
