[orc]Upgrade to 1.5.7, disable tzdata test. (#8980)

4 files changed, 45 insertions, 31 deletions

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 cb359deba..f31ff2d6a 100644
--- a/ports/orc/CONTROL
+++ b/ports/orc/CONTROL
@@ -1,5 +1,5 @@
 Source: orc
-Version: 1.5.6-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 b3f52729f..e55f79812 100644
--- a/ports/orc/portfile.cmake
+++ b/ports/orc/portfile.cmake
@@ -1,15 +1,13 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/orc
-    REF 8a8e471f6a7064e9538374374e57c9e5b4be520d
-    SHA512 c10d6f56965abde585607473142cedea25e2085147e5c66e1991cbbb313543a919d93f9a830c76ae1331f97fafe4e9a47157062b05d80746869bc3f73772e3bc
+    REF 61e9d008d06a4f9291ee62737fbfd0e34f9b20d5 # rel/release-1.5.7
+    SHA512 0c19bc91629bd5b201542e57de9eb1d6cc09fae507fb07a5ad589a631cb78957d32d888840f393c9e4ee0c60bc2ba534107eb97c31d80cd6e487df346fb719f7
     HEAD_REF master
     PATCHES
       0003-dependencies-from-vcpkg.patch
       0004-update-tzdata.patch
-      no-werror.patch
+      0005-disable-tzdata.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake")
@@ -35,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)
@@ -59,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)