Merge branch 'master' into vcpkg_nuget

6 files changed, 95 insertions, 111 deletions

diff --git a/ports/orc/0003-dependencies-from-vcpkg.patch b/ports/orc/0003-dependencies-from-vcpkg.patch
index ae62d9fb0..f9cc44b99 100644
--- a/ports/orc/0003-dependencies-from-vcpkg.patch
+++ b/ports/orc/0003-dependencies-from-vcpkg.patch
@@ -1,65 +1,44 @@
 diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
-index 235ced8..0042a88 100644
+index fae9be0..35cfb5f 100644
 --- a/c++/src/CMakeLists.txt
 +++ b/c++/src/CMakeLists.txt
-@@ -218,12 +218,13 @@ endif(BUILD_LIBHDFSPP)
+@@ -215,11 +215,12 @@ endif(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP)
  add_library (orc STATIC ${SOURCE_FILES})
-
+ 
  target_link_libraries (orc
 -  protobuf
 -  zlib
 -  snappy
 -  lz4
--  zstd
 -  ${LIBHDFSPP_LIBRARIES}
 +  PRIVATE
 +    protobuf::libprotobuf
 +    ZLIB::ZLIB
 +    Snappy::snappy
 +    ${LZ4_STATIC_LIB}
-+    ${ZSTD_STATIC_LIB}
 +    ${LIBHDFSPP_LIBRARIES}
    )
-
+ 
  install(TARGETS orc DESTINATION lib)
-diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
-index db68578..709ad07 100644
---- a/c++/test/CMakeLists.txt
-+++ b/c++/test/CMakeLists.txt
-@@ -50,10 +50,10 @@ add_executable (orc-test
-
- target_link_libraries (orc-test
-   orc
--  lz4
--  protobuf
--  snappy
--  zlib
-+  protobuf::libprotobuf
-+  ZLIB::ZLIB
-+  Snappy::snappy
-+  ${LZ4_STATIC_LIB}
-   ${GTEST_LIBRARIES}
- )
-
 diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
-index 1a28b1a..89f57d8 100644
+index f8584c0..fe48340 100644
 --- a/cmake_modules/ThirdpartyToolchain.cmake
 +++ b/cmake_modules/ThirdpartyToolchain.cmake
-@@ -59,8 +59,8 @@ endif ()
+@@ -51,8 +51,8 @@ endif ()
  # ----------------------------------------------------------------------
  # Snappy
-
+ 
 -if (NOT "${SNAPPY_HOME}" STREQUAL "")
 -  find_package (Snappy REQUIRED)
-+if (NOT "${SNAPPY_HOME}" STREQUAL "" OR 1)
++if (1)
 +  find_package (Snappy CONFIG REQUIRED)
    set(SNAPPY_VENDORED FALSE)
  else ()
    set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install")
-@@ -78,10 +78,6 @@ else ()
+@@ -70,10 +70,6 @@ else ()
    set(SNAPPY_VENDORED TRUE)
  endif ()
-
+ 
 -include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR})
 -add_library (snappy STATIC IMPORTED)
 -set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB})
@@ -67,20 +46,19 @@ index 1a28b1a..89f57d8 100644
  if (SNAPPY_VENDORED)
    add_dependencies (snappy snappy_ep)
    if (INSTALL_VENDORED_LIBS)
-@@ -93,7 +89,8 @@ endif ()
+@@ -85,7 +81,7 @@ endif ()
  # ----------------------------------------------------------------------
  # ZLIB
-
+ 
 -if (NOT "${ZLIB_HOME}" STREQUAL "")
-+
-+if (NOT "${ZLIB_HOME}" STREQUAL "" OR 1)
++if (1)
    find_package (ZLIB REQUIRED)
    set(ZLIB_VENDORED FALSE)
  else ()
-@@ -120,10 +117,6 @@ else ()
+@@ -112,10 +108,6 @@ else ()
    set(ZLIB_VENDORED TRUE)
  endif ()
-
+ 
 -include_directories (SYSTEM ${ZLIB_INCLUDE_DIR})
 -add_library (zlib STATIC IMPORTED)
 -set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB})
@@ -88,45 +66,21 @@ index 1a28b1a..89f57d8 100644
  if (ZLIB_VENDORED)
    add_dependencies (zlib zlib_ep)
    if (INSTALL_VENDORED_LIBS)
-@@ -134,9 +127,8 @@ endif ()
-
- # ----------------------------------------------------------------------
- # Zstd
--
--if (NOT "${ZSTD_HOME}" STREQUAL "")
--  find_package (zstd REQUIRED)
-+if (NOT "${ZSTD_HOME}" STREQUAL "" OR 1)
-+  find_library(ZSTD_STATIC_LIB NAMES zstd zstd_static)
-   set(ZSTD_VENDORED FALSE)
- else ()
-   set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install")
-@@ -169,10 +161,6 @@ else ()
-   set(ZSTD_VENDORED TRUE)
- endif ()
-
--include_directories (SYSTEM ${ZSTD_INCLUDE_DIR})
--add_library (zstd STATIC IMPORTED)
--set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB})
--
- if (ZSTD_VENDORED)
-   add_dependencies (zstd zstd_ep)
-   if (INSTALL_VENDORED_LIBS)
-@@ -183,9 +171,8 @@ endif ()
-
+@@ -127,8 +119,8 @@ endif ()
  # ----------------------------------------------------------------------
  # LZ4
--
+ 
 -if (NOT "${LZ4_HOME}" STREQUAL "")
 -  find_package (LZ4 REQUIRED)
-+if (NOT "${LZ4_HOME}" STREQUAL "" OR 1)
-+  find_library(LZ4_STATIC_LIB NAMES lz4d lz4)
++if (1)
++  find_library (LZ4_STATIC_LIB NAMES lz4d lz4)
    set(LZ4_VENDORED FALSE)
  else ()
    set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install")
-@@ -211,10 +198,6 @@ else ()
+@@ -154,10 +146,6 @@ else ()
    set(LZ4_VENDORED TRUE)
  endif ()
-
+ 
 -include_directories (SYSTEM ${LZ4_INCLUDE_DIR})
 -add_library (lz4 STATIC IMPORTED)
 -set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB})
@@ -134,22 +88,21 @@ index 1a28b1a..89f57d8 100644
  if (LZ4_VENDORED)
    add_dependencies (lz4 lz4_ep)
    if (INSTALL_VENDORED_LIBS)
-@@ -287,9 +270,8 @@ endif ()
-
+@@ -231,8 +219,8 @@ endif ()
  # ----------------------------------------------------------------------
  # Protobuf
--
+ 
 -if (NOT "${PROTOBUF_HOME}" STREQUAL "")
 -  find_package (Protobuf REQUIRED)
-+if (NOT "${PROTOBUF_HOME}" STREQUAL "" OR 1)
-+  find_package (protobuf CONFIG REQUIRED)
++if (1)
++  find_package (Protobuf CONFIG REQUIRED)
    set(PROTOBUF_VENDORED FALSE)
  else ()
    set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install")
-@@ -325,14 +307,6 @@ else ()
+@@ -268,14 +256,6 @@ else ()
    set(PROTOBUF_VENDORED TRUE)
  endif ()
-
+ 
 -include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR})
 -
 -add_library (protobuf STATIC IMPORTED)
@@ -162,18 +115,18 @@ index 1a28b1a..89f57d8 100644
    add_dependencies (protoc protobuf_ep)
    add_dependencies (protobuf protobuf_ep)
 diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
-index f5a53ca..15391bf 100644
+index 667fab4..7745fe0 100644
 --- a/tools/src/CMakeLists.txt
 +++ b/tools/src/CMakeLists.txt
-@@ -51,7 +51,6 @@ add_executable (orc-metadata
-
+@@ -49,7 +49,6 @@ add_executable (orc-metadata
+ 
  target_link_libraries (orc-metadata
    orc
 -  protobuf
-   ${CMAKE_THREAD_LIBS_INIT}
    )
-
-@@ -95,4 +94,7 @@ install(TARGETS
+ 
+  add_executable (orc-statistics
+@@ -88,4 +87,7 @@ install(TARGETS
     orc-contents
     orc-metadata
     orc-statistics
diff --git a/ports/orc/0004-update-tzdata.patch b/ports/orc/0004-update-tzdata.patch
new file mode 100644
index 000000000..fa9ae2fad
--- /dev/null
+++ b/ports/orc/0004-update-tzdata.patch
@@ -0,0 +1,15 @@
+diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
+index 1a28b1ae..74f0e61c 100644
+--- a/cmake_modules/ThirdpartyToolchain.cmake
++++ b/cmake_modules/ThirdpartyToolchain.cmake
+@@ -228,8 +228,8 @@ endif ()
+ 
+ if (WIN32)
+   ExternalProject_Add(tzdata_ep
+-    URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2018c-1.tar.xz"
+-    URL_HASH MD5=F69FCA5C906FAFF02462D3D06F28267C
++    URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2019b-1.tar.xz"
++    URL_HASH MD5=17D8AB346BB1009D4EB35BC08040E51D
+     CONFIGURE_COMMAND ""
+     BUILD_COMMAND ""
+     INSTALL_COMMAND "")
diff --git a/ports/orc/0005-disable-tzdata.patch b/ports/orc/0005-disable-tzdata.patch
new file mode 100644
index 000000000..4b81fd2a4
--- /dev/null
+++ b/ports/orc/0005-disable-tzdata.patch
@@ -0,0 +1,31 @@
+diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
+index 0a04aaf..795f5c9 100644
+--- a/c++/test/CMakeLists.txt
++++ b/c++/test/CMakeLists.txt
+@@ -64,6 +64,7 @@ target_link_libraries (create-test-files
+   protobuf
+ )
+ 
++if (ENABLE_TEST)
+ if (TEST_VALGRIND_MEMCHECK)
+   add_test (orc-test
+           valgrind --tool=memcheck --leak-check=full --error-exitcode=1 ./orc-test)
+@@ -78,3 +79,4 @@ if (WIN32)
+       ENVIRONMENT "TZDIR=${TZDATA_DIR}"
+     )
+ endif ()
++endif()
+\ No newline at end of file
+diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
+index c816cdc..16075f2 100644
+--- a/cmake_modules/ThirdpartyToolchain.cmake
++++ b/cmake_modules/ThirdpartyToolchain.cmake
+@@ -157,7 +157,7 @@ endif ()
+ # ----------------------------------------------------------------------
+ # IANA - Time Zone Database
+ 
+-if (WIN32)
++if (WIN32 AND TEST_VALGRIND_MEMCHECK)
+   ExternalProject_Add(tzdata_ep
+     URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2019b-1.tar.xz"
+     URL_HASH MD5=17D8AB346BB1009D4EB35BC08040E51D
diff --git a/ports/orc/CONTROL b/ports/orc/CONTROL
index 4cb08a814..f31ff2d6a 100644
--- a/ports/orc/CONTROL
+++ b/ports/orc/CONTROL
@@ -1,4 +1,5 @@
 Source: orc
-Version: 1.5.5-1
+Version: 1.5.7
+Homepage: https://orc.apache.org/
 Build-Depends: zlib, protobuf, lz4, snappy, zstd, gtest
 Description: The smallest, fastest columnar storage for Hadoop workloads.
diff --git a/ports/orc/no-werror.patch b/ports/orc/no-werror.patch
deleted file mode 100644
index d2572612f..000000000
--- a/ports/orc/no-werror.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4484e373..87b5ed41 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,9 +81,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-   set (WARN_FLAGS "${WARN_FLAGS} -Wno-covered-switch-default")
-   set (WARN_FLAGS "${WARN_FLAGS} -Wno-missing-noreturn -Wno-unknown-pragmas")
-   set (WARN_FLAGS "${WARN_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
--  set (WARN_FLAGS "${WARN_FLAGS} -Wconversion -Werror")
-+  set (WARN_FLAGS "${WARN_FLAGS} -Wconversion")
- elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--  set (WARN_FLAGS "-Wall -Wno-unknown-pragmas -Wconversion -Werror")
-+  set (WARN_FLAGS "-Wall -Wno-unknown-pragmas -Wconversion")
-   if (CMAKE_CXX_COMPILER_VERSION STREQUAL "" OR
-       CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
-     set (CXX11_FLAGS "-std=c++0x")
diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake
index f993755e9..e55f79812 100644
--- a/ports/orc/portfile.cmake
+++ b/ports/orc/portfile.cmake
@@ -1,14 +1,13 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/orc
-    REF 47a490f083bd411bf04bfed8131eef42606d7789
-    SHA512 c2650d9fd367a5ec04c79c16434728e5c20608131f21bfc89d412cbaf8dd4ae5900b03e59df21d3617d8c6a9504e4b14b1f788157afa90b57d733499d2995e39
+    REF 61e9d008d06a4f9291ee62737fbfd0e34f9b20d5 # rel/release-1.5.7
+    SHA512 0c19bc91629bd5b201542e57de9eb1d6cc09fae507fb07a5ad589a631cb78957d32d888840f393c9e4ee0c60bc2ba534107eb97c31d80cd6e487df346fb719f7
     HEAD_REF master
     PATCHES
       0003-dependencies-from-vcpkg.patch
-      no-werror.patch
+      0004-update-tzdata.patch
+      0005-disable-tzdata.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake")
@@ -34,15 +33,18 @@ vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
   OPTIONS
-  -DBUILD_TOOLS=${BUILD_TOOLS}
-  -DBUILD_CPP_TESTS=OFF
-  -DBUILD_JAVA=OFF
-  -DINSTALL_VENDORED_LIBS=OFF
-  -DBUILD_LIBHDFSPP=OFF
-  -DPROTOBUF_EXECUTABLE:FILEPATH=${PROTOBUF_EXECUTABLE}
+    -DBUILD_TOOLS=${BUILD_TOOLS}
+    -DBUILD_CPP_TESTS=OFF
+    -DBUILD_JAVA=OFF
+    -DINSTALL_VENDORED_LIBS=OFF
+    -DBUILD_LIBHDFSPP=OFF
+    -DPROTOBUF_EXECUTABLE:FILEPATH=${PROTOBUF_EXECUTABLE}
+    -DSTOP_BUILD_ON_WARNING=OFF
+    -DENABLE_TEST=OFF
 )
 
 vcpkg_install_cmake()
+vcpkg_copy_pdbs()
 
 file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/orc-*)
 if(TOOLS)
@@ -58,8 +60,6 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/orc RENAME copyright)
-
-vcpkg_copy_pdbs()
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)