From de38c89252e734d0c5c5ede0b6e68296208e5053 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 24 May 2022 12:17:57 -0400 Subject: libarchive: Update script to get 3.5.3 --- Utilities/Scripts/update-libarchive.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Utilities') diff --git a/Utilities/Scripts/update-libarchive.bash b/Utilities/Scripts/update-libarchive.bash index 3a24e2b3ef..8f5b13a66d 100755 --- a/Utilities/Scripts/update-libarchive.bash +++ b/Utilities/Scripts/update-libarchive.bash @@ -8,7 +8,7 @@ readonly name="LibArchive" readonly ownership="LibArchive Upstream " readonly subtree="Utilities/cmlibarchive" readonly repo="https://github.com/libarchive/libarchive.git" -readonly tag="v3.5.1" +readonly tag="v3.5.3" readonly shortlog=false readonly paths=" CMakeLists.txt -- cgit v1.2.1 From ac5e524763de5890088b4398b124fd6fd734c234 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 16 Feb 2022 07:40:05 -0500 Subject: libarchive: include archive_platform.h first in blake2s sources This is the libarchive convention in all other `.c` sources. It ensures that the configured `_WIN32_WINNT` value is defined before including any system headers. --- Utilities/cmlibarchive/libarchive/archive_blake2s_ref.c | 2 ++ Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c | 2 ++ 2 files changed, 4 insertions(+) (limited to 'Utilities') diff --git a/Utilities/cmlibarchive/libarchive/archive_blake2s_ref.c b/Utilities/cmlibarchive/libarchive/archive_blake2s_ref.c index d92ffd0fc5..93d3281189 100644 --- a/Utilities/cmlibarchive/libarchive/archive_blake2s_ref.c +++ b/Utilities/cmlibarchive/libarchive/archive_blake2s_ref.c @@ -13,6 +13,8 @@ https://blake2.net. */ +#include "archive_platform.h" + #include #include #include diff --git a/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c b/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c index aef101084a..b913a4db65 100644 --- a/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c +++ b/Utilities/cmlibarchive/libarchive/archive_blake2sp_ref.c @@ -13,6 +13,8 @@ https://blake2.net. */ +#include "archive_platform.h" + #include #include #include -- cgit v1.2.1 From e2fe1d17e6af2b544fe75dcfb57269d638094a86 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 24 May 2022 12:34:08 -0400 Subject: libarchive: Update build within CMake after changes in 3.5.3 --- Utilities/cmThirdPartyChecks.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Utilities') diff --git a/Utilities/cmThirdPartyChecks.cmake b/Utilities/cmThirdPartyChecks.cmake index 7e38df945f..c7b3c8a1b1 100644 --- a/Utilities/cmThirdPartyChecks.cmake +++ b/Utilities/cmThirdPartyChecks.cmake @@ -118,6 +118,7 @@ if(WIN32) set(HAVE_LIBWS2_32 1) set(HAVE_LIMITS_H 1) set(HAVE_LINK 0) + set(HAVE_LINKAT 0) set(HAVE_LINUX_FIEMAP_H 0) set(HAVE_LINUX_FS_H 0) set(HAVE_LINUX_MAGIC_H 0) @@ -184,6 +185,7 @@ if(WIN32) set(HAVE_STROPTS_H 0) set(HAVE__STRTOI64 1) set(HAVE_STRTOLL 1) + set(HAVE_STRUCT_STATFS 0) set(HAVE_STRUCT_STATFS_F_NAMEMAX 0) set(HAVE_STRUCT_STAT_ST_BIRTHTIME 0) set(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 0) -- cgit v1.2.1