diff options
| author | Bob Kast <bob.kast@emc.com> | 2018-11-13 15:48:26 -0500 |
|---|---|---|
| committer | Bob Kast <bob.kast@emc.com> | 2018-11-13 15:48:26 -0500 |
| commit | d9e39bb4056795a70028b228a746da4889ca7c15 (patch) | |
| tree | 4853304e1e71e45becedfba5d83e3f5321e0b9c9 /ports/libarchive | |
| parent | 1a9dadf855ab93ff0803fd1ce4ecceec5bf211f0 (diff) | |
| parent | ffa114aaa43e8bcdf880d6e2c47ee0ed46125070 (diff) | |
| download | vcpkg-d9e39bb4056795a70028b228a746da4889ca7c15.tar.gz vcpkg-d9e39bb4056795a70028b228a746da4889ca7c15.zip | |
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts:
# ports/ecsutil/CONTROL
# ports/ecsutil/portfile.cmake
Diffstat (limited to 'ports/libarchive')
| -rw-r--r-- | ports/libarchive/CONTROL | 29 | ||||
| -rw-r--r-- | ports/libarchive/portfile.cmake | 43 |
2 files changed, 67 insertions, 5 deletions
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index dfcfa66b3..af3d528b8 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,4 +1,29 @@ Source: libarchive
-Version: 3.3.2-2
+Version: 3.3.3-2
Description: Library for reading and writing streaming archives
-Build-Depends: zlib, bzip2, libxml2, lz4, liblzma, openssl
+Build-Depends: zlib
+Default-Features: bzip2, libxml2, lz4, lzma, lzo, openssl
+
+Feature: bzip2
+Build-Depends: bzip2
+Description: BZip2 support
+
+Feature: libxml2
+Build-Depends: libxml2
+Description: Libxml2 support
+
+Feature: lz4
+Build-Depends: lz4
+Description: LZ4 support
+
+Feature: lzma
+Build-Depends: liblzma
+Description: LZMA support
+
+Feature: lzo
+Build-Depends: lzo
+Description: LZO support
+
+Feature: openssl
+Build-Depends: openssl
+Description: OpenSSL support
diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 1e36af1bb..a2a35ad65 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -7,8 +7,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libarchive/libarchive
- REF v3.3.2
- SHA512 7bc17d6f742080278e35f86b0233d70045df0ca1578cd427126e0acce183709bf33ecca689db65e2e67bdfaf687c04d36cae1202a926beeebc88076648aa40bc
+ REF v3.3.3
+ SHA512 10063764b610c0c966ba0177cac0d2cb781e297a45545cc8a587741513089af26f40769670894c86e7985b73c47e9cb985253bc3bef3a12fa83fe2a6a30acb6d
HEAD_REF master
PATCHES
${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch
@@ -17,11 +17,48 @@ vcpkg_from_github( ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch
)
+set(BUILD_libarchive_bzip2 OFF)
+if("bzip2" IN_LIST FEATURES)
+ set(BUILD_libarchive_bzip2 ON)
+endif()
+
+set(BUILD_libarchive_libxml2 OFF)
+if("libxml2" IN_LIST FEATURES)
+ set(BUILD_libarchive_libxml2 ON)
+endif()
+set(BUILD_libarchive_libxml2 OFF)
+
+set(BUILD_libarchive_lz4 OFF)
+if("lz4" IN_LIST FEATURES)
+ set(BUILD_libarchive_lz4 ON)
+endif()
+
+set(BUILD_libarchive_lzma OFF)
+if("lzma" IN_LIST FEATURES)
+ set(BUILD_libarchive_lzma ON)
+endif()
+
+set(BUILD_libarchive_lzo OFF)
+if("lzo" IN_LIST FEATURES)
+ set(BUILD_libarchive_lzo ON)
+endif()
+
+set(BUILD_libarchive_openssl OFF)
+if("openssl" IN_LIST FEATURES)
+ set(BUILD_libarchive_openssl ON)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
- -DENABLE_LZO=OFF
+ -DENABLE_BZip2=${BUILD_libarchive_bzip2}
+ -DENABLE_LIBXML2=${BUILD_libarchive_libxml2}
+ -DENABLE_LZ4=${BUILD_libarchive_lz4}
+ -DENABLE_LZMA=${BUILD_libarchive_lzma}
+ -DENABLE_LZO=${BUILD_libarchive_lzo}
+ -DENABLE_OPENSSL=${BUILD_libarchive_openssl}
+ -DENABLE_PCREPOSIX=OFF
-DENABLE_NETTLE=OFF
-DENABLE_EXPAT=OFF
-DENABLE_LibGCC=OFF
|