diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-12 13:22:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 13:22:08 -0700 |
| commit | 808b2aa563c996b68a5db94b96b2e9d2bd985485 (patch) | |
| tree | c29695761c4eeb8384508b13510bd466253f219d | |
| parent | 388d1d41bb011e16c41cbe59c14884af0dd7d8ec (diff) | |
| parent | cceab527882fb078f15d70d8ba3a68d4be9ec594 (diff) | |
| download | vcpkg-808b2aa563c996b68a5db94b96b2e9d2bd985485.tar.gz vcpkg-808b2aa563c996b68a5db94b96b2e9d2bd985485.zip | |
Merge pull request #1443 from codicodi/libarchive-3.3.2
[libarchive] update to 3.3.2
| -rw-r--r-- | ports/libarchive/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libarchive/fix-buildsystem.patch | 4 | ||||
| -rw-r--r-- | ports/libarchive/portfile.cmake | 13 |
3 files changed, 9 insertions, 10 deletions
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index f4f9b8cdd..3cd81ee5c 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,4 +1,4 @@ Source: libarchive
-Version: 3.3.1-1
+Version: 3.3.2
Description: Library for reading and writing streaming archives
Build-Depends: zlib, bzip2, libxml2, lz4, liblzma, openssl
diff --git a/ports/libarchive/fix-buildsystem.patch b/ports/libarchive/fix-buildsystem.patch index fcfe67c4f..59ffec3c9 100644 --- a/ports/libarchive/fix-buildsystem.patch +++ b/ports/libarchive/fix-buildsystem.patch @@ -132,8 +132,8 @@ index 1f85c01..11b2fb1 100644 --- a/libarchive/CMakeLists.txt +++ b/libarchive/CMakeLists.txt @@ -210,28 +210,22 @@ IF(WIN32 AND NOT CYGWIN) - LIST(APPEND libarchive_SOURCES filter_fork_windows.c) - ENDIF(WIN32 AND NOT CYGWIN) + LIST(APPEND libarchive_SOURCES archive_disk_acl_sunos.c) + ENDIF() -# Libarchive is a shared library -ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS}) diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 72958dfda..a5bed4143 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -4,14 +4,13 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) endif()
include(vcpkg_common_functions)
-set(ARCHIVE_VERSION 3.3.1)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libarchive-${ARCHIVE_VERSION})
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/libarchive/libarchive/archive/v${ARCHIVE_VERSION}.zip"
- FILENAME "libarchive-${ARCHIVE_VERSION}.zip"
- SHA512 a54fe3c5c24c83df244f3f2346212a6aa8d8945cf4ddc407e54c891ebbf8c98b93492e5652c9813a6d5dc654a32479e08a40bb0d2af7400a29ac027028e986f5)
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO libarchive/libarchive
+ REF v3.3.2
+ SHA512 7bc17d6f742080278e35f86b0233d70045df0ca1578cd427126e0acce183709bf33ecca689db65e2e67bdfaf687c04d36cae1202a926beeebc88076648aa40bc
+ HEAD_REF master)
-vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
|