mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:51:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libarchive] Update to 3.4.1 (#9676)

Browse Source
This commit is contained in:
Oleg Shparber 2020-01-17 19:13:12 -05:00 committed by Victor Romero
parent 08c8214d68
commit 6ee44d2260
2 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libarchive/CONTROL
View File

@ -1,5 +1,5 @@
Source: libarchive
Version: 3.4.0-2
Version: 3.4.1
Homepage: https://github.com/libarchive/libarchive
Description: Library for reading and writing streaming archives
Build-Depends: zlib

54
ports/libarchive/portfile.cmake
View File

@ -1,14 +1,10 @@
# libarchive uses winapi functions not available in WindowsStore
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
message(FATAL_ERROR "Error: UWP builds are not supported.")
endif()
vcpkg_fail_port_install(ON_TARGET "UWP")
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libarchive/libarchive
REF 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3
SHA512 8feac2c0e22e5b7c05f3be97c774ad82d39bdea4b3fa3a2b297b85f8a5a9f548c528ef63f5495afd42fb75759e03a4108f3831b27103f899f8fe4ef7e8e2d1cf
REF cce09646b566c61c2debff58a70da780b8457883
SHA512 3eef6844269ecb9c3b7c848013539529e6ef2d298b6ca6c3c939a2a2e39da98db36bd66eea8893224bc4318edc073639136fbca71b2b0bec65216562e8188749
HEAD_REF master
PATCHES
fix-buildsystem.patch
@ -18,46 +14,20 @@ vcpkg_from_github(
fix-cpu-set.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_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_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
bzip2 ENABLE_BZip2
libxml2 ENABLE_LIBXML2
lz4 ENABLE_LZ4
lzma ENABLE_LZMA
lzo ENABLE_LZO
openssl ENABLE_OPENSSL
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-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}
${FEATURE_OPTIONS}
-DENABLE_PCREPOSIX=OFF
-DENABLE_NETTLE=OFF
-DENABLE_EXPAT=OFF