From 7971d70e10386bbc2cd7f646f8e99b28cde1b0c7 Mon Sep 17 00:00:00 2001 From: DDoSolitary Date: Tue, 22 May 2018 19:43:24 +0800 Subject: Fix dep to lz4 for libarchive. Fix #3271. --- ports/libarchive/fix-lz4.patch | 18 ++++++++++++++++++ ports/libarchive/portfile.cmake | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ports/libarchive/fix-lz4.patch diff --git a/ports/libarchive/fix-lz4.patch b/ports/libarchive/fix-lz4.patch new file mode 100644 index 000000000..6a3d974fc --- /dev/null +++ b/ports/libarchive/fix-lz4.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73bf07b3..76a1d61d 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 diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index a5bed4143..04ce714fb 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -15,7 +15,8 @@ vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch) + ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-lz4.patch) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} -- cgit v1.2.3 From 98898a3b7ce406deca331fa50a3fbca358d157f9 Mon Sep 17 00:00:00 2001 From: DDoSolitary Date: Wed, 23 May 2018 18:29:16 +0800 Subject: [libarchive] Fix indenting. --- ports/libarchive/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 04ce714fb..d361b7da8 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -16,7 +16,7 @@ vcpkg_apply_patches( PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-lz4.patch) + ${CMAKE_CURRENT_LIST_DIR}/fix-lz4.patch) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} -- cgit v1.2.3 From 4772ed9965df907ea0dc29d92929b1cd4f89a0c9 Mon Sep 17 00:00:00 2001 From: DDoSolitary Date: Wed, 23 May 2018 18:31:43 +0800 Subject: [libarchive] Increase build number. --- ports/libarchive/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index c17693807..dfcfa66b3 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,4 +1,4 @@ Source: libarchive -Version: 3.3.2-1 +Version: 3.3.2-2 Description: Library for reading and writing streaming archives Build-Depends: zlib, bzip2, libxml2, lz4, liblzma, openssl -- cgit v1.2.3