From c662389d252576f4ccedd5446a5f89d1e51723dc Mon Sep 17 00:00:00 2001 From: Antoine Leca Date: Thu, 23 Feb 2012 00:35:10 +0100 Subject: [PATCH] Enable LZMA supprt with tar(1) --- commands/tar/Makefile | 4 ++-- commands/tar/config.h | 4 ++-- lib/libarchive/config.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commands/tar/Makefile b/commands/tar/Makefile index 8f5735212..dfd48ed14 100644 --- a/commands/tar/Makefile +++ b/commands/tar/Makefile @@ -11,8 +11,8 @@ SRCS= bsdtar.c \ write.c .include "${.CURDIR}/libarchive_fe/Makefile.inc" -DPADD+= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} -LDADD+= -larchive -lbz2 -lz +DPADD+= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} +LDADD+= -larchive -lbz2 -lz -llzma CPPFLAGS+= -DHAVE_CONFIG_H CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/libarchive_fe diff --git a/commands/tar/config.h b/commands/tar/config.h index db48c55d6..00cd7c64e 100644 --- a/commands/tar/config.h +++ b/commands/tar/config.h @@ -232,7 +232,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 */ @@ -284,7 +284,7 @@ /* #undef HAVE_LZMADEC_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_LZMA_H */ +#define HAVE_LZMA_H 1 /* Define to 1 if you have the `MD5Init' function. */ /* #undef HAVE_MD5INIT */ diff --git a/lib/libarchive/config.h b/lib/libarchive/config.h index 8de8d312e..5770c1ea2 100644 --- a/lib/libarchive/config.h +++ b/lib/libarchive/config.h @@ -232,7 +232,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 */ @@ -284,7 +284,7 @@ /* #undef HAVE_LZMADEC_H */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_LZMA_H */ +#define HAVE_LZMA_H 1 /* Define to 1 if you have the `MD5Init' function. */ /* #undef HAVE_MD5INIT */