mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 17:53:03 +08:00
[libarchive] Update to 3.4.3 (#13179)
This commit is contained in:
JonLiu1993
GitHub
parent
5471b158cf
commit
f13b6b1354
@ -1,6 +1,5 @@
|
||||
Source: libarchive
|
||||
Version: 3.4.1
|
||||
Port-Version: 5
|
||||
Version: 3.4.3
|
||||
Homepage: https://github.com/libarchive/libarchive
|
||||
Description: Library for reading and writing streaming archives
|
||||
Build-Depends: zlib
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 911ae5b..0e12b56 100644
|
||||
index b2634da..d037071 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -151,9 +151,6 @@ IF (MSVC)
|
||||
@@ -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 C4061: The enumerate has no associated handler in a switch
|
||||
- # statement.
|
||||
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4061")
|
||||
- # 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} /we4254")
|
||||
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14254")
|
||||
@ -1,5 +1,5 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index bd80b12..6509541 100644
|
||||
index b2634da..6a1dc1f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -148,10 +148,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
|
||||
@ -13,7 +13,7 @@ index bd80b12..6509541 100644
|
||||
#################################################################
|
||||
# Set compile flags for debug build.
|
||||
# This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
|
||||
@@ -377,8 +373,6 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
|
||||
@@ -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.
|
||||
@ -22,7 +22,7 @@ index bd80b12..6509541 100644
|
||||
#
|
||||
# If you didn't use Setup program or installed into nonstandard path,
|
||||
# cmake cannot find out your zlib or bzip2 libraries and include files,
|
||||
@@ -415,14 +409,7 @@ IF(ZLIB_FOUND)
|
||||
@@ -420,14 +414,7 @@ IF(ZLIB_FOUND)
|
||||
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
|
||||
LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
|
||||
IF(WIN32 AND NOT CYGWIN)
|
||||
@ -34,11 +34,11 @@ index bd80b12..6509541 100644
|
||||
- RUNS
|
||||
- "#include <zlib.h>\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
|
||||
+ SET(ZLIB_WINAPI OFF) # skip following test, it crashes with weird message box
|
||||
IF(ZLIB_WINAPI)
|
||||
ADD_DEFINITIONS(-DZLIB_WINAPI)
|
||||
ELSE(ZLIB_WINAPI)
|
||||
@@ -482,8 +469,6 @@ IF(LIBLZMA_FOUND)
|
||||
@@ -487,8 +474,6 @@ IF(LIBLZMA_FOUND)
|
||||
SET(HAVE_LIBLZMA 1)
|
||||
SET(HAVE_LZMA_H 1)
|
||||
CMAKE_PUSH_CHECK_STATE()
|
||||
@ -47,7 +47,7 @@ index bd80b12..6509541 100644
|
||||
INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
|
||||
LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES})
|
||||
# Test if a macro is needed for the library.
|
||||
@@ -1327,7 +1312,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
|
||||
@@ -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)
|
||||
@ -56,7 +56,7 @@ index bd80b12..6509541 100644
|
||||
CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR)
|
||||
CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO)
|
||||
CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD)
|
||||
@@ -1359,11 +1344,11 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
|
||||
@@ -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)
|
||||
@ -73,7 +73,7 @@ index bd80b12..6509541 100644
|
||||
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)
|
||||
@@ -1375,10 +1360,10 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
|
||||
@@ -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)
|
||||
@ -88,21 +88,25 @@ index bd80b12..6509541 100644
|
||||
|
||||
CMAKE_POP_CHECK_STATE() # Restore the state of the variables
|
||||
|
||||
@@ -1419,9 +1404,13 @@ CHECK_C_SOURCE_COMPILES(
|
||||
@@ -1449,6 +1434,9 @@ CHECK_C_SOURCE_COMPILES(
|
||||
"#include <sys/sysmacros.h>\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 <lzma.h>\n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}"
|
||||
HAVE_LZMA_STREAM_ENCODER_MT)
|
||||
@@ -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)
|
||||
@@ -1977,13 +1966,10 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
|
||||
@@ -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)
|
||||
|
||||
@ -118,10 +122,10 @@ index bd80b12..6509541 100644
|
||||
# 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 ec775bb..d63ac7c 100644
|
||||
index 9389bbc..0793d96 100644
|
||||
--- a/libarchive/CMakeLists.txt
|
||||
+++ b/libarchive/CMakeLists.txt
|
||||
@@ -235,28 +235,22 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
|
||||
@@ -236,28 +236,22 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
|
||||
ENDIF()
|
||||
|
||||
# Libarchive is a shared library
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 61c3b2a..c47b5b4 100644
|
||||
index b2634da..8608efc 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -783,7 +783,7 @@ main(int argc, char **argv)
|
||||
@@ -914,7 +914,7 @@ main(int argc, char **argv)
|
||||
IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
|
||||
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
|
||||
LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES})
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 80871bc9..2a16dc70 100644
|
||||
index b2634da..3b6da5d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -517,7 +517,10 @@ IF(ENABLE_LZ4)
|
||||
@@ -574,7 +574,10 @@ IF(ENABLE_LZ4)
|
||||
ENDIF (LZ4_INCLUDE_DIR)
|
||||
|
||||
FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
|
||||
|
||||
@ -1,17 +1,8 @@
|
||||
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
|
||||
index b2634da..e43b041 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -588,7 +588,10 @@ IF(ENABLE_ZSTD)
|
||||
@@ -605,7 +605,10 @@ IF(ENABLE_ZSTD)
|
||||
ENDIF (ZSTD_INCLUDE_DIR)
|
||||
|
||||
FIND_PATH(ZSTD_INCLUDE_DIR zstd.h)
|
||||
@ -23,6 +14,3 @@ index 13da432..911ae5b 100644
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
|
||||
ELSE(ENABLE_ZSTD)
|
||||
--
|
||||
2.16.1.windows.1
|
||||
|
||||
|
||||
@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP")
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO libarchive/libarchive
|
||||
REF cce09646b566c61c2debff58a70da780b8457883
|
||||
SHA512 3eef6844269ecb9c3b7c848013539529e6ef2d298b6ca6c3c939a2a2e39da98db36bd66eea8893224bc4318edc073639136fbca71b2b0bec65216562e8188749
|
||||
REF fc6563f5130d8a7ee1fc27c0e55baef35119f26c #v3.4.3
|
||||
SHA512 54ca4f3cc3b38dcf6588b2369ce43109c4a57a04061348ab8bf046c5c13ace0c4f42c9f3961288542cb5fe12c05359d572b39fe7cec32a10151dbac78e8a3707
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-buildsystem.patch
|
||||
@ -12,7 +12,7 @@ vcpkg_from_github(
|
||||
fix-lz4.patch
|
||||
fix-zstd.patch
|
||||
fix-cpu-set.patch
|
||||
disable-c4061.patch
|
||||
disable-warnings.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
|
||||
Loading…
Reference in New Issue
Block a user