From d6c17dbb3178dbd27b7e1be3fd0e4c166591e643 Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 19 Jan 2020 17:36:57 +0000 Subject: [PATCH] Fix static linking (sun2) --- tests/lib/libarchive/Makefile | 8 ++++---- tests/usr.bin/cpio/Makefile | 9 ++++----- tests/usr.bin/tar/Makefile | 8 ++++---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tests/lib/libarchive/Makefile b/tests/lib/libarchive/Makefile index c257bc08e897..733e7688a425 100644 --- a/tests/lib/libarchive/Makefile +++ b/tests/lib/libarchive/Makefile @@ -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/test -I${LIBARCHIVE}/../include .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 --git a/tests/usr.bin/cpio/Makefile b/tests/usr.bin/cpio/Makefile index 202732ade823..4e3f3ca2c516 100644 --- a/tests/usr.bin/cpio/Makefile +++ b/tests/usr.bin/cpio/Makefile @@ -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_netbsd.h"' .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 --git a/tests/usr.bin/tar/Makefile b/tests/usr.bin/tar/Makefile index 5071302698ff..36a75c01c3d0 100644 --- a/tests/usr.bin/tar/Makefile +++ b/tests/usr.bin/tar/Makefile @@ -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 \