Tue Nov 2 19:14:54 2010 UTC ()
Enable direct XZ support
(joerg)
diff -r1.2 -r1.3 src/external/bsd/libarchive/bin/Makefile.inc
diff -r1.4 -r1.5 src/external/bsd/libarchive/include/config_netbsd.h
diff -r1.2 -r1.3 src/external/bsd/libarchive/lib/libarchive/Makefile
--- src/external/bsd/libarchive/bin/Makefile.inc 2010/02/20 02:55:53 1.2
+++ src/external/bsd/libarchive/bin/Makefile.inc 2010/11/02 19:14:53 1.3
@@ -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
--- src/external/bsd/libarchive/include/config_netbsd.h 2010/07/14 22:14:17 1.4
+++ src/external/bsd/libarchive/include/config_netbsd.h 2010/11/02 19:14:54 1.5
@@ -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
--- src/external/bsd/libarchive/lib/libarchive/Makefile 2010/02/20 22:49:22 1.2
+++ src/external/bsd/libarchive/lib/libarchive/Makefile 2010/11/02 19:14:54 1.3
@@ -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 \