Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests Fix static linking (sun2)



details:   https://anonhg.NetBSD.org/src/rev/cd4eea03dcd8
branches:  trunk
changeset: 1006573:cd4eea03dcd8
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 19 17:36:57 2020 +0000

description:
Fix static linking (sun2)

diffstat:

 tests/lib/libarchive/Makefile |  8 ++++----
 tests/usr.bin/cpio/Makefile   |  9 ++++-----
 tests/usr.bin/tar/Makefile    |  8 ++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diffs (67 lines):

diff -r ce95b14f3bd5 -r cd4eea03dcd8 tests/lib/libarchive/Makefile
--- a/tests/lib/libarchive/Makefile     Sun Jan 19 17:26:57 2020 +0000
+++ b/tests/lib/libarchive/Makefile     Sun Jan 19 17:36:57 2020 +0000
@@ -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 @@
 
 .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 \
diff -r ce95b14f3bd5 -r cd4eea03dcd8 tests/usr.bin/cpio/Makefile
--- a/tests/usr.bin/cpio/Makefile       Sun Jan 19 17:26:57 2020 +0000
+++ b/tests/usr.bin/cpio/Makefile       Sun Jan 19 17:36:57 2020 +0000
@@ -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 @@
 .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 \
diff -r ce95b14f3bd5 -r cd4eea03dcd8 tests/usr.bin/tar/Makefile
--- a/tests/usr.bin/tar/Makefile        Sun Jan 19 17:26:57 2020 +0000
+++ b/tests/usr.bin/tar/Makefile        Sun Jan 19 17:36:57 2020 +0000
@@ -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 @@
 
 .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 \



Home | Main Index | Thread Index | Old Index