mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 20:23:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1443 from codicodi/libarchive-3.3.2

Browse Source 
[libarchive] update to 3.3.2
This commit is contained in:
Robert Schumacher 2017-07-12 13:22:08 -07:00 committed by GitHub
commit 808b2aa563
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libarchive/CONTROL
View File

@ -1,4 +1,4 @@
Source: libarchive Source: libarchive
Version: 3.3.1-1 Version: 3.3.2
Description: Library for reading and writing streaming archives Description: Library for reading and writing streaming archives
Build-Depends: zlib, bzip2, libxml2, lz4, liblzma, openssl Build-Depends: zlib, bzip2, libxml2, lz4, liblzma, openssl

4
ports/libarchive/fix-buildsystem.patch
View File

@ -132,8 +132,8 @@ index 1f85c01..11b2fb1 100644
--- a/libarchive/CMakeLists.txt --- a/libarchive/CMakeLists.txt
+++ b/libarchive/CMakeLists.txt +++ b/libarchive/CMakeLists.txt
@@ -210,28 +210,22 @@ IF(WIN32 AND NOT CYGWIN) @@ -210,28 +210,22 @@ IF(WIN32 AND NOT CYGWIN)
LIST(APPEND libarchive_SOURCES filter_fork_windows.c) LIST(APPEND libarchive_SOURCES archive_disk_acl_sunos.c)
ENDIF(WIN32 AND NOT CYGWIN) ENDIF()
-# Libarchive is a shared library -# Libarchive is a shared library
-ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS}) -ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})

13
ports/libarchive/portfile.cmake
View File

@ -4,14 +4,13 @@ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
endif() endif()
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(ARCHIVE_VERSION 3.3.1) vcpkg_from_github(
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libarchive-${ARCHIVE_VERSION}) OUT_SOURCE_PATH SOURCE_PATH
vcpkg_download_distfile(ARCHIVE REPO libarchive/libarchive
URLS "https://github.com/libarchive/libarchive/archive/v${ARCHIVE_VERSION}.zip" REF v3.3.2
FILENAME "libarchive-${ARCHIVE_VERSION}.zip" SHA512 7bc17d6f742080278e35f86b0233d70045df0ca1578cd427126e0acce183709bf33ecca689db65e2e67bdfaf687c04d36cae1202a926beeebc88076648aa40bc
SHA512 a54fe3c5c24c83df244f3f2346212a6aa8d8945cf4ddc407e54c891ebbf8c98b93492e5652c9813a6d5dc654a32479e08a40bb0d2af7400a29ac027028e986f5) HEAD_REF master)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches( vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PATCHES PATCHES