Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425

4 files changed, 112 insertions, 10 deletions

diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
index c17693807..af3d528b8 100644
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@@ -1,4 +1,29 @@
 Source: libarchive

-Version: 3.3.2-1

+Version: 3.3.3-2

 Description: Library for reading and writing streaming archives

-Build-Depends: zlib, bzip2, libxml2, lz4, liblzma, openssl

+Build-Depends: zlib

+Default-Features: bzip2, libxml2, lz4, lzma, lzo, openssl

+

+Feature: bzip2

+Build-Depends: bzip2

+Description: BZip2 support

+

+Feature: libxml2

+Build-Depends: libxml2

+Description: Libxml2 support

+

+Feature: lz4

+Build-Depends: lz4

+Description: LZ4 support

+

+Feature: lzma

+Build-Depends: liblzma

+Description: LZMA support

+

+Feature: lzo

+Build-Depends: lzo

+Description: LZO support

+

+Feature: openssl

+Build-Depends: openssl

+Description: OpenSSL support

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/no-werror.patch b/ports/libarchive/no-werror.patch
new file mode 100644
index 000000000..fbd3be8c6
--- /dev/null
+++ b/ports/libarchive/no-werror.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 745dc29..820c56f 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -96,7 +96,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")

+   #################################################################

+   # Set compile flags for debug build.

+   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"

+-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")

++  #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")

+@@ -112,7 +112,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")

+   # Set compile flags for debug build.

+   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")

+-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")

++  #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")

+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")

diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake
index a5bed4143..a2a35ad65 100644
--- a/ports/libarchive/portfile.cmake
+++ b/ports/libarchive/portfile.cmake
@@ -7,21 +7,58 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libarchive/libarchive

-    REF v3.3.2

-    SHA512 7bc17d6f742080278e35f86b0233d70045df0ca1578cd427126e0acce183709bf33ecca689db65e2e67bdfaf687c04d36cae1202a926beeebc88076648aa40bc

-    HEAD_REF master)

-

-vcpkg_apply_patches(

-    SOURCE_PATH ${SOURCE_PATH}

+    REF v3.3.3

+    SHA512 10063764b610c0c966ba0177cac0d2cb781e297a45545cc8a587741513089af26f40769670894c86e7985b73c47e9cb985253bc3bef3a12fa83fe2a6a30acb6d

+    HEAD_REF master

     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

+        ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch

+)

+

+set(BUILD_libarchive_bzip2 OFF)

+if("bzip2" IN_LIST FEATURES)

+  set(BUILD_libarchive_bzip2 ON)

+endif()

+

+set(BUILD_libarchive_libxml2 OFF)

+if("libxml2" IN_LIST FEATURES)

+  set(BUILD_libarchive_libxml2 ON)

+endif()

+set(BUILD_libarchive_libxml2 OFF)

+

+set(BUILD_libarchive_lz4 OFF)

+if("lz4" IN_LIST FEATURES)

+  set(BUILD_libarchive_lz4 ON)

+endif()

+

+set(BUILD_libarchive_lzma OFF)

+if("lzma" IN_LIST FEATURES)

+  set(BUILD_libarchive_lzma ON)

+endif()

+

+set(BUILD_libarchive_lzo OFF)

+if("lzo" IN_LIST FEATURES)

+  set(BUILD_libarchive_lzo ON)

+endif()

+

+set(BUILD_libarchive_openssl OFF)

+if("openssl" IN_LIST FEATURES)

+  set(BUILD_libarchive_openssl ON)

+endif()

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

     OPTIONS

-        -DENABLE_LZO=OFF

+        -DENABLE_BZip2=${BUILD_libarchive_bzip2}

+        -DENABLE_LIBXML2=${BUILD_libarchive_libxml2}

+        -DENABLE_LZ4=${BUILD_libarchive_lz4}

+        -DENABLE_LZMA=${BUILD_libarchive_lzma}

+        -DENABLE_LZO=${BUILD_libarchive_lzo}

+        -DENABLE_OPENSSL=${BUILD_libarchive_openssl}

+        -DENABLE_PCREPOSIX=OFF

         -DENABLE_NETTLE=OFF

         -DENABLE_EXPAT=OFF

         -DENABLE_LibGCC=OFF