diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-10-14 13:28:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-14 13:28:15 -0700 |
| commit | b748d448d2588add8814c38c97a2d07dcddd73ad (patch) | |
| tree | c2a5f2b81502c686d215de7f0e2351babfec2a03 | |
| parent | 0b111e58f3a81e6cd1df0c174d72717008287d32 (diff) | |
| parent | 1835f4c56c14223b539eaf6e20003fd031392516 (diff) | |
| download | vcpkg-b748d448d2588add8814c38c97a2d07dcddd73ad.tar.gz vcpkg-b748d448d2588add8814c38c97a2d07dcddd73ad.zip | |
Merge pull request #8564 from CaeruleusAqua/master
Mixed release and debug build in libarchive
| -rw-r--r-- | ports/libarchive/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libarchive/fix-zstd.patch | 28 | ||||
| -rw-r--r-- | ports/libarchive/portfile.cmake | 3 |
3 files changed, 31 insertions, 2 deletions
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index 78c63e4b5..19bee0af1 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,5 +1,5 @@ Source: libarchive
-Version: 3.4.0 +Version: 3.4.0-1
Homepage: https://github.com/libarchive/libarchive
Description: Library for reading and writing streaming archives
Build-Depends: zlib
diff --git a/ports/libarchive/fix-zstd.patch b/ports/libarchive/fix-zstd.patch new file mode 100644 index 000000000..5c3b6cd54 --- /dev/null +++ b/ports/libarchive/fix-zstd.patch @@ -0,0 +1,28 @@ +From 9397ed51eddf43481d5710eb80441ce4a64356ea Mon Sep 17 00:00:00 2001 +From: Julian Scholle <julian.scholle@iff.fraunhofer.de> +Date: Fri, 11 Oct 2019 16:46:06 +0200 +Subject: [PATCH] test + +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13da432..911ae5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -588,7 +588,10 @@ IF(ENABLE_ZSTD) + ENDIF (ZSTD_INCLUDE_DIR) + + FIND_PATH(ZSTD_INCLUDE_DIR zstd.h) +- FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd) ++ FIND_LIBRARY(ZSTD_LIBRARY_DEBUG NAMES zstdd libzstdd) ++ FIND_LIBRARY(ZSTD_LIBRARY_RELEASE NAMES zstd libzstd) ++ INCLUDE(SelectLibraryConfigurations) ++ SELECT_LIBRARY_CONFIGURATIONS(ZSTD) + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR) + ELSE(ENABLE_ZSTD) +-- +2.16.1.windows.1 + diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index c3973d8ab..3b69a69b9 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -7,13 +7,14 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libarchive/libarchive
- REF 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3 + REF 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3
SHA512 8feac2c0e22e5b7c05f3be97c774ad82d39bdea4b3fa3a2b297b85f8a5a9f548c528ef63f5495afd42fb75759e03a4108f3831b27103f899f8fe4ef7e8e2d1cf
HEAD_REF master
PATCHES
fix-buildsystem.patch
fix-dependencies.patch
fix-lz4.patch
+ fix-zstd.patch
)
set(BUILD_libarchive_bzip2 OFF)
|