svn commit: r352482 - in head: . lib lib/libarchive
Baptiste Daroussin
bapt at FreeBSD.org
Wed Sep 18 07:57:57 UTC 2019
Author: bapt
Date: Wed Sep 18 07:57:56 2019
New Revision: 352482
URL: https://svnweb.freebsd.org/changeset/base/352482
Log:
Add native support for zstd to libarchive
Note that old pkg will failed to build after this. A recent ports tree (one
providing pkg 1.12+) is required to build. Older already built pkg, should
continue working as expected
PR: 238797
Exp run by: antoine
Reviewed by: cem
Approved by: cem
Differential Revision: https://reviews.freebsd.org/D20752
Modified:
head/Makefile.inc1
head/lib/Makefile
head/lib/libarchive/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Wed Sep 18 07:32:15 2019 (r352481)
+++ head/Makefile.inc1 Wed Sep 18 07:57:56 2019 (r352482)
@@ -2770,6 +2770,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \
lib/libfigpar \
${_lib_libgssapi} \
lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \
+ lib/libzstd \
${_lib_casper} \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam/libpam ${_lib_libthr} \
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Wed Sep 18 07:32:15 2019 (r352481)
+++ head/lib/Makefile Wed Sep 18 07:57:56 2019 (r352482)
@@ -102,7 +102,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
# libraries, those libraries should be listed as build order dependencies here.
SUBDIR_DEPEND_geom= libufs
-SUBDIR_DEPEND_libarchive= libz libbz2 libexpat liblzma libmd
+SUBDIR_DEPEND_libarchive= libz libbz2 libexpat liblzma libmd libzstd
SUBDIR_DEPEND_libauditdm= libbsm
SUBDIR_DEPEND_libbsnmp= ${_libnetgraph}
SUBDIR_DEPEND_libc++:= libcxxrt
Modified: head/lib/libarchive/Makefile
==============================================================================
--- head/lib/libarchive/Makefile Wed Sep 18 07:32:15 2019 (r352481)
+++ head/lib/libarchive/Makefile Wed Sep 18 07:57:56 2019 (r352482)
@@ -6,8 +6,8 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
LIB= archive
-LIBADD= z bz2 lzma bsdxml
-CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
+LIBADD= z bz2 lzma bsdxml zstd
+CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1
# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
# It has no real relation to the libarchive version number.
@@ -15,6 +15,7 @@ SHLIB_MAJOR= 7
CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
CFLAGS+= -I${.OBJDIR}
+CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib
.if ${MK_OPENSSL} != "no"
CFLAGS+= -DWITH_OPENSSL
More information about the svn-src-head
mailing list