diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /lib/libarchive | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/Makefile | 22 | ||||
| -rw-r--r-- | lib/libarchive/config_freebsd.h | 7 | ||||
| -rw-r--r-- | lib/libarchive/test/Makefile | 3 |
3 files changed, 13 insertions, 19 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index b7e9d7f..9dfad77 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -4,19 +4,9 @@ LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIB= archive -DPADD= ${LIBZ} -LDADD= -lz -DPADD+= ${LIBBZ2} -LDADD+= -lbz2 -CFLAGS+= -DHAVE_BZLIB_H=1 - -DPADD+= ${LIBLZMA} -LDADD+= -llzma -CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 - -DPADD+= ${LIBBSDXML} -LDADD+= -lbsdxml +LIBADD= z bz2 lzma bsdxml +CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. @@ -27,17 +17,15 @@ CFLAGS+= -I${.OBJDIR} .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto .else -DPADD+= ${LIBMD} -LDADD+= -lmd +LIBADD+= md .endif .if ${MK_ICONV} != "no" # TODO: This can be changed back to CFLAGS once iconv works correctly # with statically linked binaries. -SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const +SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST= .endif .if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \ diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h index 0df3f91..fbf429f 100644 --- a/lib/libarchive/config_freebsd.h +++ b/lib/libarchive/config_freebsd.h @@ -25,6 +25,8 @@ * $FreeBSD$ */ +#include <osreldate.h> + /* FreeBSD 5.0 and later have ACL and extattr support. */ #if __FreeBSD__ > 4 #define HAVE_ACL_CREATE_ENTRY 1 @@ -220,6 +222,11 @@ #define HAVE_ZLIB_H 1 #define TIME_WITH_SYS_TIME 1 +#if __FreeBSD_version >= 1100056 +#define HAVE_FUTIMENS 1 +#define HAVE_UTIMENSAT 1 +#endif + /* FreeBSD 4 and earlier lack intmax_t/uintmax_t */ #if __FreeBSD__ < 5 #define intmax_t int64_t diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile index 16a485a..80d6dd4 100644 --- a/lib/libarchive/test/Makefile +++ b/lib/libarchive/test/Makefile @@ -6,9 +6,8 @@ MAN= PROG=libarchive_test INTERNALPROG=yes # Don't install this; it's just for testing -DPADD=${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBCRYPTO} ${LIBBSDXML} LDADD= -L ${.OBJDIR}/.. -larchive -LDADD+= -lz -lbz2 -llzma -lmd -lcrypto -lbsdxml +LIBADD= z bz2 lzma md crypto bsdxml CFLAGS+= -g CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR} CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/test_utils |
