From: Hasso Tepper <hasso@dragonflybsd.org>
Date: Wed, 18 Jun 2008 06:28:21 +0000 (+0000)
Subject: Link libarchive against libbz2 and libz to be compatible with upstream.
X-Git-Tag: v2.0.1~390
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/1b167821dc5a8375369782730f0af3479d1abf10

Link libarchive against libbz2 and libz to be compatible with upstream.
In this way third party applications linking against libarchive don't need
a special care.
---

diff --git a/Makefile.inc1 b/Makefile.inc1
index 4aa6bccff4..e7b41fe0ae 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.116 2008/05/14 15:02:44 hasso Exp $
+# $DragonFly: src/Makefile.inc1,v 1.117 2008/06/18 06:28:21 hasso Exp $
 #
 # Build-time options are documented in make.conf(5).
 #
@@ -911,7 +911,7 @@ _startup_libs34=	gnu/lib/gcc34/csu gnu/lib/gcc34/libgcc
 _startup_libs41=	gnu/lib/gcc41/csu gnu/lib/gcc41/libgcc
 _startup_libs=		lib/libc lib/libc_rtld
 
-_prebuild_libs=	lib/libarchive
+_prebuild_libs=		lib/libbz2 lib/libz lib/libarchive
 _prebuild_libs+=	lib/libutil
 
 _generic_libs=	gnu/lib
@@ -927,7 +927,7 @@ _generic_libs+=	kerberos5/lib
 
 _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libmd \
 		lib/libncurses/libncurses lib/libopie lib/libradius \
-		lib/libsbuf lib/libskey lib/libtacplus lib/libz lib/libm \
+		lib/libsbuf lib/libskey lib/libtacplus lib/libm \
 		lib/libpam lib/lib${THREAD_LIB}
 
 lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 4a150ce3ad..8174deff75 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/lib/libarchive/Makefile,v 1.50 2006/09/05 05:59:45 kientzle Exp $
-# $DragonFly: src/lib/libarchive/Makefile,v 1.20 2008/06/16 08:20:23 pavalos Exp $
+# $DragonFly: src/lib/libarchive/Makefile,v 1.21 2008/06/18 06:28:21 hasso Exp $
 
 LIB=	archive
 
@@ -11,6 +11,9 @@ CFLAGS+=	-DPLATFORM_CONFIG_H=\"config.h\"
 CFLAGS+=	-I${.OBJDIR} -I${.CURDIR} -I${CONTRIBDIR}
 WARNS?=	6
 
+DPADD=	${LIBBZ2} ${LIBZ}
+LDADD=	-lbz2 -lz
+
 INCS=	archive.h archive_entry.h
 
 SRCS=	archive_check_magic.c				\