From c85057efd962d7f79890f71b53e58cf0efeceb58 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 21 Jan 2021 18:05:03 +0800 Subject: [PATCH 1/2] [libarchive] update to 3.5.1 --- ports/libarchive/CONTROL | 3 +- ports/libarchive/disable-warnings.patch | 14 -- ports/libarchive/fix-buildsystem.patch | 163 ------------------------ ports/libarchive/fix-cpu-set.patch | 15 --- ports/libarchive/fix-dependencies.patch | 150 ---------------------- ports/libarchive/portfile.cmake | 18 ++- 6 files changed, 12 insertions(+), 351 deletions(-) delete mode 100644 ports/libarchive/disable-warnings.patch delete mode 100644 ports/libarchive/fix-buildsystem.patch delete mode 100644 ports/libarchive/fix-cpu-set.patch delete mode 100644 ports/libarchive/fix-dependencies.patch diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index a16b6179e27b2f..02a2ec7d549aa4 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,6 +1,5 @@ Source: libarchive -Version: 3.4.3 -Port-Version: 3 +Version: 3.5.1 Homepage: https://github.com/libarchive/libarchive Description: Library for reading and writing streaming archives Build-Depends: zlib diff --git a/ports/libarchive/disable-warnings.patch b/ports/libarchive/disable-warnings.patch deleted file mode 100644 index 455939479a04df..00000000000000 --- a/ports/libarchive/disable-warnings.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2634da..d037071 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -155,9 +155,6 @@ IF (MSVC) - ################################################################# - # Set compile flags for debug build. - # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" -- # Enable level 4 C4062: The enumerate has no associated handler in a switch -- # statement and there is no default that can catch it. -- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14062") - # Enable level 4 C4254: A larger bit field was assigned to a smaller bit - # field. - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14254") diff --git a/ports/libarchive/fix-buildsystem.patch b/ports/libarchive/fix-buildsystem.patch deleted file mode 100644 index 9ed57f6f1041bf..00000000000000 --- a/ports/libarchive/fix-buildsystem.patch +++ /dev/null @@ -1,163 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2634da..6a1dc1f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -148,10 +148,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use") - ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$") - IF (MSVC) -- if (ENABLE_WERROR) -- # /WX option is the same as gcc's -Werror option. -- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") -- endif () - ################################################################# - # Set compile flags for debug build. - # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug" -@@ -382,8 +378,6 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") - # Maybe DLL path is "C:/Program Files/GnuWin32/bin". - # The zlib and the bzip2 Setup program have installed programs and DLLs into - # "C:/Program Files/GnuWin32" by default. -- # This is convenience setting for Windows. -- SET(CMAKE_PREFIX_PATH ${__GNUWIN32PATH} $(CMAKE_PREFIX_PATH)) - # - # If you didn't use Setup program or installed into nonstandard path, - # cmake cannot find out your zlib or bzip2 libraries and include files, -@@ -420,14 +414,7 @@ IF(ZLIB_FOUND) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) - LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES}) - IF(WIN32 AND NOT CYGWIN) -- # -- # Test if ZLIB_WINAPI macro is needed to use. -- # -- TRY_MACRO_FOR_LIBRARY( -- "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}" -- RUNS -- "#include \nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }" -- ZLIB_WINAPI) -+ SET(ZLIB_WINAPI OFF) # skip following test, it crashes with weird message box - IF(ZLIB_WINAPI) - ADD_DEFINITIONS(-DZLIB_WINAPI) - ELSE(ZLIB_WINAPI) -@@ -487,8 +474,6 @@ IF(LIBLZMA_FOUND) - SET(HAVE_LIBLZMA 1) - SET(HAVE_LZMA_H 1) - CMAKE_PUSH_CHECK_STATE() -- SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR}) -- SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES}) - INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) - LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) - # Test if a macro is needed for the library. -@@ -1356,7 +1341,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R) - CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT) - CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES) - CHECK_FUNCTION_EXISTS_GLIBC(mbrtowc HAVE_MBRTOWC) --CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE) -+set(HAVE_MEMMOVE 1) - CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR) - CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO) - CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD) -@@ -1388,11 +1373,11 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME) - CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES) - CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT) - CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK) --CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB) --CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP) --CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY) --CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN) --CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB) -+set(HAVE_WCRTOMB 1) -+set(HAVE_WCSCMP 1) -+set(HAVE_WCSCPY 1) -+set(HAVE_WCSLEN 1) -+set(HAVE_WCTOMB 1) - CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S) - CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64) - CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE) -@@ -1405,10 +1390,10 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH) - CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO) - CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R) - CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME) --CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF) --CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP) --CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY) --CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE) -+set(HAVE_VPRINTF 1) -+set(HAVE_WMEMCMP 1) -+set(HAVE_WMEMCPY 1) -+set(HAVE_WMEMMOVE 1) - - CMAKE_POP_CHECK_STATE() # Restore the state of the variables - -@@ -1449,6 +1434,9 @@ CHECK_C_SOURCE_COMPILES( - "#include \nint main() { return major(256); }" - MAJOR_IN_SYSMACROS) - -+CMAKE_PUSH_CHECK_STATE() -+SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR}) -+SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES}) - IF(ENABLE_LZMA) - CHECK_C_SOURCE_COMPILES( - "#include \n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}" -@@ -1456,6 +1444,7 @@ CHECK_C_SOURCE_COMPILES( - ELSE() - SET(HAVE_LZMA_STREAM_ENCODER_MT 0) - ENDIF(ENABLE_LZMA) -+CMAKE_POP_CHECK_STATE() - - IF(HAVE_STRERROR_R) - SET(HAVE_DECL_STRERROR_R 1) -@@ -2012,13 +2001,10 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in - INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - ADD_DEFINITIONS(-DHAVE_CONFIG_H) - --# Handle generation of the libarchive.pc file for pkg-config --INCLUDE(CreatePkgConfigFile) -- - # - # Register installation of PDF documents. - # --IF(WIN32 AND NOT CYGWIN) -+IF(0) - # - # On Windows platform, It's better that we install PDF documents - # on one's computer. -diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt -index 9389bbc..0793d96 100644 ---- a/libarchive/CMakeLists.txt -+++ b/libarchive/CMakeLists.txt -@@ -236,28 +236,22 @@ ELSEIF(ARCHIVE_ACL_SUNOS) - ENDIF() - - # Libarchive is a shared library --ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS}) -+ADD_LIBRARY(archive ${libarchive_SOURCES} ${include_HEADERS}) - TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .) - TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS}) --SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION}) -- --# archive_static is a static library --ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS}) --TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS}) --SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS -+IF(BUILD_SHARED_LIBS) -+ SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION}) -+ELSE() -+ SET_TARGET_PROPERTIES(archive PROPERTIES COMPILE_DEFINITIONS - LIBARCHIVE_STATIC) --# On Posix systems, libarchive.so and libarchive.a can co-exist. --IF(NOT WIN32 OR CYGWIN) -- SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive) --ENDIF(NOT WIN32 OR CYGWIN) -+ENDIF() - - IF(ENABLE_INSTALL) - # How to install the libraries -- INSTALL(TARGETS archive archive_static -+ INSTALL(TARGETS archive - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) -- INSTALL_MAN(${libarchive_MANS}) - INSTALL(FILES ${include_HEADERS} DESTINATION include) - ENDIF() - diff --git a/ports/libarchive/fix-cpu-set.patch b/ports/libarchive/fix-cpu-set.patch deleted file mode 100644 index 8d1924dbe86abe..00000000000000 --- a/ports/libarchive/fix-cpu-set.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/libarchive/archive_random.c b/libarchive/archive_random.c -index 65ea691..63217ec 100644 ---- a/libarchive/archive_random.c -+++ b/libarchive/archive_random.c -@@ -48,6 +48,10 @@ __FBSDID("$FreeBSD$"); - #include - #endif - #ifdef HAVE_PTHREAD_H -+#ifdef __GNUC__ -+#define _GNU_SOURCE -+#include -+#endif - #include - #endif - diff --git a/ports/libarchive/fix-dependencies.patch b/ports/libarchive/fix-dependencies.patch deleted file mode 100644 index 0d3213c6766f52..00000000000000 --- a/ports/libarchive/fix-dependencies.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 39b5333..8164d8f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -433,7 +433,7 @@ MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY) - # Find BZip2 - # - IF(ENABLE_BZip2) -- FIND_PACKAGE(BZip2) -+ FIND_PACKAGE(BZip2 REQUIRED) - ELSE() - SET(BZIP2_FOUND FALSE) # Override cached value - ENDIF() -@@ -462,27 +462,15 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES) - # Find LZMA - # - IF(ENABLE_LZMA) -- FIND_PACKAGE(LibLZMA) -+ FIND_PACKAGE(LibLZMA CONFIG REQUIRED) - ELSE() - SET(LIBLZMA_FOUND FALSE) # Override cached value - ENDIF() - --IF(LIBLZMA_FOUND) -+IF(LibLZMA_FOUND) - SET(HAVE_LIBLZMA 1) - SET(HAVE_LZMA_H 1) -- CMAKE_PUSH_CHECK_STATE() -- INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS}) -- LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES}) -- # Test if a macro is needed for the library. -- TRY_MACRO_FOR_LIBRARY( -- "${LIBLZMA_INCLUDE_DIRS}" "${LIBLZMA_LIBRARIES}" -- COMPILES -- "#include \nint main() {return (int)lzma_version_number(); }" -- "WITHOUT_LZMA_API_STATIC;LZMA_API_STATIC") -- IF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC) -- ADD_DEFINITIONS(-DLZMA_API_STATIC) -- ENDIF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC) -- CMAKE_POP_CHECK_STATE() -+ LIST(APPEND ADDITIONAL_LIBS LibLZMA::LibLZMA) - ELSE(LIBLZMA_FOUND) - # LZMA not found and will not be used. - ENDIF(LIBLZMA_FOUND) -@@ -555,22 +543,15 @@ IF(ENABLE_LZ4) - SET(LZ4_FIND_QUIETLY TRUE) - ENDIF (LZ4_INCLUDE_DIR) - -- FIND_PATH(LZ4_INCLUDE_DIR lz4.h) -- FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4) -- INCLUDE(FindPackageHandleStandardArgs) -- FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR) -+ FIND_PACKAGE(lz4 CONFIG REQUIRED) - ELSE(ENABLE_LZ4) - SET(LZ4_FOUND FALSE) # Override cached value - ENDIF(ENABLE_LZ4) --IF(LZ4_FOUND) -+IF(lz4_FOUND) -+ SET(HAVE_LZ4HC_H 1) - SET(HAVE_LIBLZ4 1) - SET(HAVE_LZ4_H 1) -- CMAKE_PUSH_CHECK_STATE() # Save the state of the variables -- SET(CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIR}) -- CHECK_INCLUDE_FILES("lz4hc.h" HAVE_LZ4HC_H) -- CMAKE_POP_CHECK_STATE() # Restore the state of the variables -- INCLUDE_DIRECTORIES(${LZ4_INCLUDE_DIR}) -- LIST(APPEND ADDITIONAL_LIBS ${LZ4_LIBRARY}) -+ LIST(APPEND ADDITIONAL_LIBS lz4::lz4) - # - # TODO: test for static library. - # -@@ -586,25 +566,20 @@ IF(ENABLE_ZSTD) - SET(ZSTD_FIND_QUIETLY TRUE) - ENDIF (ZSTD_INCLUDE_DIR) - -- FIND_PATH(ZSTD_INCLUDE_DIR zstd.h) -- FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd) -- INCLUDE(FindPackageHandleStandardArgs) -- FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR) -+ FIND_PACKAGE(zstd CONFIG REQUIRED) - ELSE(ENABLE_ZSTD) - SET(ZSTD_FOUND FALSE) # Override cached value - ENDIF(ENABLE_ZSTD) --IF(ZSTD_FOUND) -+IF(zstd_FOUND) - SET(HAVE_ZSTD_H 1) -- INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR}) -- LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARY}) -- CMAKE_PUSH_CHECK_STATE() -- SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARY}) -- SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR}) -- CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_LIBZSTD) -- # -- # TODO: test for static library. -- # -- CMAKE_POP_CHECK_STATE() -+ SET(HAVE_LIBZSTD 1) -+ IF(TARGET zstd::libzstd_shared) -+ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_shared) -+ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_shared) -+ ELSE(TARGET zstd::libzstd_shared) -+ LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_static) -+ SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_static) -+ ENDIF(TARGET zstd::libzstd_shared) - ENDIF(ZSTD_FOUND) - MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR) - MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY) -@@ -773,11 +742,11 @@ ENDIF(ENABLE_NETTLE) - # (Except on Mac, where OpenSSL is deprecated.) - # - IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") -- FIND_PACKAGE(OpenSSL) -- IF(OPENSSL_FOUND) -+ FIND_PACKAGE(OpenSSL REQUIRED) -+ IF(OpenSSL_FOUND) - SET(HAVE_LIBCRYPTO 1) -- INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) -- LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_CRYPTO_LIBRARY}) -+ LIST(APPEND ADDITIONAL_LIBS OpenSSL::Crypto) -+ message("OPENSSL_CRYPTO_LIBRARY: OpenSSL::Crypto") - ENDIF(OPENSSL_FOUND) - ELSE() - SET(OPENSSL_FOUND FALSE) # Override cached value -@@ -896,7 +865,6 @@ main(int argc, char **argv) - IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) - LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) -- LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS) - ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) - ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) - ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM}) -@@ -1128,7 +1096,7 @@ ENDIF(ENABLE_ICONV) - # Find Libxml2 - # - IF(ENABLE_LIBXML2) -- FIND_PACKAGE(LibXml2) -+ FIND_PACKAGE(LibXml2 REQUIRED) - ELSE() - SET(LIBXML2_FOUND FALSE) - ENDIF() -@@ -1432,8 +1400,7 @@ CHECK_C_SOURCE_COMPILES( - MAJOR_IN_SYSMACROS) - - CMAKE_PUSH_CHECK_STATE() --SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR}) --SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES}) -+SET(CMAKE_REQUIRED_LIBRARIES LibLZMA::LibLZMA) - IF(ENABLE_LZMA) - CHECK_C_SOURCE_COMPILES( - "#include \n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}" diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 4e6a5fd852d892..d8e1be519a48ac 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -3,14 +3,14 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libarchive/libarchive - REF fc6563f5130d8a7ee1fc27c0e55baef35119f26c #v3.4.3 - SHA512 54ca4f3cc3b38dcf6588b2369ce43109c4a57a04061348ab8bf046c5c13ace0c4f42c9f3961288542cb5fe12c05359d572b39fe7cec32a10151dbac78e8a3707 + REF 227a4b9719a7fbeba6ba46e377ff7d953f405cd5 #v3.5.1 + SHA512 65adce56266a72ac25e3e36253ad66e4af4ba319a85d399362417a91e395adbc86caa39637a98c33af3a4147b03ca8836b647518b898346a5243f8cfc224ef32 HEAD_REF master PATCHES - fix-buildsystem.patch - fix-dependencies.patch - fix-cpu-set.patch - disable-warnings.patch + #fix-buildsystem.patch + #fix-dependencies.patch + #fix-cpu-set.patch + #disable-warnings.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -70,7 +70,11 @@ vcpkg_copy_pdbs() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() foreach(HEADER ${CURRENT_PACKAGES_DIR}/include/archive.h ${CURRENT_PACKAGES_DIR}/include/archive_entry.h) file(READ ${HEADER} CONTENTS) string(REPLACE "(!defined LIBARCHIVE_STATIC)" "0" CONTENTS "${CONTENTS}") From d1f55ff9cef1e47a27a805fdcd9bde9d47034351 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Thu, 21 Jan 2021 18:05:41 +0800 Subject: [PATCH 2/2] Update port_version --- port_versions/baseline.json | 4 ++-- port_versions/l-/libarchive.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 1cb2af9c71e60e..8656a662ac2a44 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -2825,8 +2825,8 @@ "port-version": 0 }, "libarchive": { - "baseline": "3.4.3", - "port-version": 3 + "baseline": "3.5.1", + "port-version": 0 }, "libass": { "baseline": "0.15.0", diff --git a/port_versions/l-/libarchive.json b/port_versions/l-/libarchive.json index ebb09268797a46..120d1d965aa91f 100644 --- a/port_versions/l-/libarchive.json +++ b/port_versions/l-/libarchive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0f525dba369788349779710cc55238cd47094af", + "version-string": "3.5.1", + "port-version": 0 + }, { "git-tree": "114dd98b5e7865923e2e06a1ffad5661b0aec246", "version-string": "3.4.3",