Merge remote-tracking branch 'upstream/master' into path_separator

# Conflicts:
#	scripts/cmake/vcpkg_common_definitions.cmake

4 files changed, 47 insertions, 79 deletions

diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
index b39593aa9..78c63e4b5 100644
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@@ -1,5 +1,5 @@
 Source: libarchive

-Version: 3.3.3-3

+Version: 3.4.0
 Homepage: https://github.com/libarchive/libarchive

 Description: Library for reading and writing streaming archives

 Build-Depends: zlib

diff --git a/ports/libarchive/fix-buildsystem.patch b/ports/libarchive/fix-buildsystem.patch
index 59ffec3c9..51dbbf2ec 100644
--- a/ports/libarchive/fix-buildsystem.patch
+++ b/ports/libarchive/fix-buildsystem.patch
@@ -1,63 +1,62 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ca9d8f..61c3b2a 100644
+index bd80b12..6509541 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -166,7 +166,7 @@ IF (MSVC)
-   #                       result of an assignment.
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4706")
-   # /WX option is the same as gcc's -Werror option.
--  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX")
-+  #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX") <- breaks x64-debug
-   # /Oi option enables built-in functions.
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Oi")
+@@ -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 ()
    #################################################################
-@@ -359,7 +359,7 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
+   # 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}")
+   # 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.
+-  # This is convenience setting for Windows.
 -  SET(CMAKE_PREFIX_PATH ${__GNUWIN32PATH} $(CMAKE_PREFIX_PATH))
-+  #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,
-@@ -399,11 +399,12 @@ IF(ZLIB_FOUND)
-     #
-     # Test if ZLIB_WINAPI macro is needed to use.
-     #
+@@ -415,14 +409,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 <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
-+    #TRY_MACRO_FOR_LIBRARY(
-+    #  "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}"
-+    #  RUNS
-+    #  "#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
-+    #  ZLIB_WINAPI)
      IF(ZLIB_WINAPI)
        ADD_DEFINITIONS(-DZLIB_WINAPI)
      ELSE(ZLIB_WINAPI)
-@@ -462,8 +463,6 @@ ENDIF()
- IF(LIBLZMA_FOUND)
+@@ -482,8 +469,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.
-@@ -1227,7 +1226,8 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
+@@ -1327,7 +1312,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)
-+#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)
-@@ -1258,11 +1258,16 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
+@@ -1359,11 +1344,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)
@@ -66,20 +65,15 @@ index 1ca9d8f..61c3b2a 100644
 -CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
 -CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
 -CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
-+#CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB)
 +set(HAVE_WCRTOMB 1)
-+#CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP)
 +set(HAVE_WCSCMP 1)
-+#CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
 +set(HAVE_WCSCPY 1)
-+#CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
 +set(HAVE_WCSLEN 1)
-+#CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
 +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)
-@@ -1274,10 +1279,14 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
+@@ -1375,10 +1360,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)
@@ -87,18 +81,14 @@ index 1ca9d8f..61c3b2a 100644
 -CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
 -CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
 -CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
-+#CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
 +set(HAVE_VPRINTF 1)
-+#CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
 +set(HAVE_WMEMCMP 1)
-+#CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
 +set(HAVE_WMEMCPY 1)
-+#CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
 +set(HAVE_WMEMMOVE 1)
  
  CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
  
-@@ -1314,9 +1323,13 @@ CHECK_C_SOURCE_COMPILES(
+@@ -1419,9 +1404,13 @@ CHECK_C_SOURCE_COMPILES(
    "#include <sys/sysmacros.h>\nint main() { return major(256); }"
    MAJOR_IN_SYSMACROS)
  
@@ -112,32 +102,32 @@ index 1ca9d8f..61c3b2a 100644
  
  IF(HAVE_STRERROR_R)
    SET(HAVE_DECL_STRERROR_R 1)
-@@ -1689,12 +1702,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+@@ -1977,13 +1966,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
+-# Handle generation of the libarchive.pc file for pkg-config
 -INCLUDE(CreatePkgConfigFile)
-+#INCLUDE(CreatePkgConfigFile)
- 
+-
  #
  # Register installation of PDF documents.
  #
 -IF(WIN32 AND NOT CYGWIN)
-+IF(0 AND 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 1f85c01..11b2fb1 100644
+index ec775bb..d63ac7c 100644
 --- a/libarchive/CMakeLists.txt
 +++ b/libarchive/CMakeLists.txt
-@@ -210,28 +210,22 @@ IF(WIN32 AND NOT CYGWIN)
-   LIST(APPEND libarchive_SOURCES archive_disk_acl_sunos.c)
+@@ -235,28 +235,22 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
  ENDIF()
  
--# Libarchive is a shared library
+ # 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})
 -
@@ -146,9 +136,9 @@ index 1f85c01..11b2fb1 100644
 -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})
++  SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
 +ELSE()
-+    SET_TARGET_PROPERTIES(archive PROPERTIES COMPILE_DEFINITIONS
++  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)
@@ -164,7 +154,6 @@ index 1f85c01..11b2fb1 100644
            LIBRARY DESTINATION lib
            ARCHIVE DESTINATION lib)
 -  INSTALL_MAN(${libarchive_MANS})
-+  #INSTALL_MAN(${libarchive_MANS})
    INSTALL(FILES ${include_HEADERS} DESTINATION include)
  ENDIF()
  
diff --git a/ports/libarchive/no-werror.patch b/ports/libarchive/no-werror.patch
deleted file mode 100644
index fbd3be8c6..000000000
--- a/ports/libarchive/no-werror.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 5d6755bc0..c3973d8ab 100644
--- a/ports/libarchive/portfile.cmake
+++ b/ports/libarchive/portfile.cmake
@@ -7,14 +7,13 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO libarchive/libarchive

-    REF v3.3.3

-    SHA512 10063764b610c0c966ba0177cac0d2cb781e297a45545cc8a587741513089af26f40769670894c86e7985b73c47e9cb985253bc3bef3a12fa83fe2a6a30acb6d

+    REF 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3
+    SHA512 8feac2c0e22e5b7c05f3be97c774ad82d39bdea4b3fa3a2b297b85f8a5a9f548c528ef63f5495afd42fb75759e03a4108f3831b27103f899f8fe4ef7e8e2d1cf

     HEAD_REF master

     PATCHES

-        ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch

-        ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch

-        ${CMAKE_CURRENT_LIST_DIR}/fix-lz4.patch

-        ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch

+        fix-buildsystem.patch

+        fix-dependencies.patch

+        fix-lz4.patch

 )

 

 set(BUILD_libarchive_bzip2 OFF)

@@ -69,7 +68,9 @@ vcpkg_configure_cmake(
         -DENABLE_ACL=OFF

         -DENABLE_TEST=OFF

         -DENABLE_ICONV=OFF

-        -DPOSIX_REGEX_LIB=NONE)

+        -DPOSIX_REGEX_LIB=NONE

+        -DENABLE_WERROR=OFF

+)

 

 vcpkg_install_cmake()

 vcpkg_copy_pdbs()