[src/trunk]: src/external/bsd/libarchive Enable direct XZ support

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3e586fa81795
branches:  trunk
changeset: 758345:3e586fa81795
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Nov 02 19:14:53 2010 +0000

description:
Enable direct XZ support

diffstat:

 external/bsd/libarchive/bin/Makefile.inc        |  6 +++---
 external/bsd/libarchive/include/config_netbsd.h |  4 ++--
 external/bsd/libarchive/lib/libarchive/Makefile |  3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r e61dc155878e -r 3e586fa81795 external/bsd/libarchive/bin/Makefile.inc
--- a/external/bsd/libarchive/bin/Makefile.inc  Tue Nov 02 19:13:58 2010 +0000
+++ b/external/bsd/libarchive/bin/Makefile.inc  Tue Nov 02 19:14:53 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2010/02/20 02:55:53 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2010/11/02 19:14:53 joerg Exp $
 
 .include "../Makefile.inc"
 
@@ -8,6 +8,6 @@
 LDSTATIC?=     -static
 .endif
 
-DPADD= ${LIBARCHIVE_FE} ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
-LDADD= -L${LIBARCHIVE_FE_DIR} -larchive_fe -larchive -lbz2 -lz
+DPADD= ${LIBARCHIVE_FE} ${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBZ}
+LDADD= -L${LIBARCHIVE_FE_DIR} -larchive_fe -larchive -lbz2 -llzma -lz
 CPPFLAGS+=     -I${LIBARCHIVEDIR}/libarchive_fe
diff -r e61dc155878e -r 3e586fa81795 external/bsd/libarchive/include/config_netbsd.h
--- a/external/bsd/libarchive/include/config_netbsd.h   Tue Nov 02 19:13:58 2010 +0000
+++ b/external/bsd/libarchive/include/config_netbsd.h   Tue Nov 02 19:14:53 2010 +0000
@@ -305,7 +305,7 @@
 /* #undef HAVE_LIBEXPAT */
 
 /* Define to 1 if you have the `lzma' library (-llzma). */
-/* #undef HAVE_LIBLZMA */
+#define HAVE_LIBLZMA 1
 
 /* Define to 1 if you have the `lzmadec' library (-llzmadec). */
 /* #undef HAVE_LIBLZMADEC */
@@ -357,7 +357,7 @@
 /* #undef HAVE_LZMADEC_H */
 
 /* Define to 1 if you have the <lzma.h> header file. */
-/* #undef HAVE_LZMA_H */
+#define HAVE_LZMA_H 1
 
 /* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
diff -r e61dc155878e -r 3e586fa81795 external/bsd/libarchive/lib/libarchive/Makefile
--- a/external/bsd/libarchive/lib/libarchive/Makefile   Tue Nov 02 19:13:58 2010 +0000
+++ b/external/bsd/libarchive/lib/libarchive/Makefile   Tue Nov 02 19:14:53 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2010/02/20 22:49:22 joerg Exp $
+#      $NetBSD: Makefile,v 1.3 2010/11/02 19:14:54 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -7,6 +7,7 @@
 LIB=           archive
 
 LIBDPLIBS+=    bz2     ${NETBSDSRCDIR}/lib/libbz2 \
+               lzma    ${NETBSDSRCDIR}/external/public-domain/xz/lib \
                z       ${NETBSDSRCDIR}/lib/libz
 
 SRCS=          archive_check_magic.c \