diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-02-28 14:36:23 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-28 14:36:23 -0800 |
| commit | 773c8267dfb506f41c204f61042f30b6143a8095 (patch) | |
| tree | 5946d1526c3ad77a2df80786a1370d96389d931b /ports/libarchive | |
| parent | 6afbceb27fd2aa39c66f810a22f5d4ad97575110 (diff) | |
| parent | 7859944528be28bee1fda9f325b78d6a7f02124e (diff) | |
| download | vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.tar.gz vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4564
Diffstat (limited to 'ports/libarchive')
| -rw-r--r-- | ports/libarchive/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libarchive/fix-lz4.patch | 28 | ||||
| -rw-r--r-- | ports/libarchive/portfile.cmake | 1 |
3 files changed, 14 insertions, 17 deletions
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index af3d528b8..7cb34cd94 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,5 +1,5 @@ Source: libarchive
-Version: 3.3.3-2
+Version: 3.3.3-3
Description: Library for reading and writing streaming archives
Build-Depends: zlib
Default-Features: bzip2, libxml2, lz4, lzma, lzo, openssl
diff --git a/ports/libarchive/fix-lz4.patch b/ports/libarchive/fix-lz4.patch index 6a3d974fc..163e55ed0 100644 --- a/ports/libarchive/fix-lz4.patch +++ b/ports/libarchive/fix-lz4.patch @@ -1,18 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73bf07b3..76a1d61d 100644 +index 80871bc9..2a16dc70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -515,7 +515,10 @@ IF (LZ4_INCLUDE_DIR) - ENDIF (LZ4_INCLUDE_DIR) - - FIND_PATH(LZ4_INCLUDE_DIR lz4.h) --FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4) -+FIND_LIBRARY(LZ4_LIBRARY_DEBUG NAMES lz4d liblz4d) -+FIND_LIBRARY(LZ4_LIBRARY_RELEASE NAMES lz4 liblz4) -+INCLUDE(SelectLibraryConfigurations) -+SELECT_LIBRARY_CONFIGURATIONS(LZ4) - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR) - IF(LZ4_FOUND) - -
\ No newline at end of file +@@ -517,7 +517,10 @@ IF(ENABLE_LZ4) + ENDIF (LZ4_INCLUDE_DIR) + + FIND_PATH(LZ4_INCLUDE_DIR lz4.h) +- FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4) ++ FIND_LIBRARY(LZ4_LIBRARY_DEBUG NAMES lz4d liblz4d) ++ FIND_LIBRARY(LZ4_LIBRARY_RELEASE NAMES lz4 liblz4) ++ INCLUDE(SelectLibraryConfigurations) ++ SELECT_LIBRARY_CONFIGURATIONS(LZ4) + INCLUDE(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR) + ELSE(ENABLE_LZ4) diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index a2a35ad65..5d6755bc0 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -26,7 +26,6 @@ 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)
|