From 728c993bc49376f4edec7238c87caf1c30e55503 Mon Sep 17 00:00:00 2001 From: DDoSolitary Date: Fri, 8 Feb 2019 06:42:50 +0800 Subject: [PATCH] fix(libarchive): fix lz4 patch to align with upstream * Fix fix-lz4.patch. * Switch base to v3.3.3 for fix-lz4.patch. --- ports/libarchive/fix-lz4.patch | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) 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)