From 22ccc7f8e876c6176a44b0243b93493c96b63643 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 24 Sep 2020 01:06:34 -0700 Subject: [PATCH 1/2] [orc] Update to the latest version --- ports/orc/0003-dependencies-from-vcpkg.patch | 299 ++++++++++--------- ports/orc/0004-update-tzdata.patch | 15 - ports/orc/0005-disable-tzdata.patch | 61 ++-- ports/orc/CONTROL | 2 +- ports/orc/portfile.cmake | 11 +- 5 files changed, 198 insertions(+), 190 deletions(-) delete mode 100644 ports/orc/0004-update-tzdata.patch diff --git a/ports/orc/0003-dependencies-from-vcpkg.patch b/ports/orc/0003-dependencies-from-vcpkg.patch index f9cc44b9984cbc..fb523770f7cb09 100644 --- a/ports/orc/0003-dependencies-from-vcpkg.patch +++ b/ports/orc/0003-dependencies-from-vcpkg.patch @@ -1,137 +1,162 @@ -diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index fae9be0..35cfb5f 100644 ---- a/c++/src/CMakeLists.txt -+++ b/c++/src/CMakeLists.txt -@@ -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 -- ${LIBHDFSPP_LIBRARIES} -+ PRIVATE -+ protobuf::libprotobuf -+ ZLIB::ZLIB -+ Snappy::snappy -+ ${LZ4_STATIC_LIB} -+ ${LIBHDFSPP_LIBRARIES} - ) - - install(TARGETS orc DESTINATION lib) -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index f8584c0..fe48340 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -51,8 +51,8 @@ endif () - # ---------------------------------------------------------------------- - # Snappy - --if (NOT "${SNAPPY_HOME}" STREQUAL "") -- find_package (Snappy REQUIRED) -+if (1) -+ find_package (Snappy CONFIG REQUIRED) - set(SNAPPY_VENDORED FALSE) - else () - set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install") -@@ -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}) -- - if (SNAPPY_VENDORED) - add_dependencies (snappy snappy_ep) - if (INSTALL_VENDORED_LIBS) -@@ -85,7 +81,7 @@ endif () - # ---------------------------------------------------------------------- - # ZLIB - --if (NOT "${ZLIB_HOME}" STREQUAL "") -+if (1) - find_package (ZLIB REQUIRED) - set(ZLIB_VENDORED FALSE) - 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}) -- - if (ZLIB_VENDORED) - add_dependencies (zlib zlib_ep) - if (INSTALL_VENDORED_LIBS) -@@ -127,8 +119,8 @@ endif () - # ---------------------------------------------------------------------- - # LZ4 - --if (NOT "${LZ4_HOME}" STREQUAL "") -- find_package (LZ4 REQUIRED) -+if (1) -+ find_library (LZ4_STATIC_LIB NAMES lz4d lz4) - set(LZ4_VENDORED FALSE) - else () - set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install") -@@ -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}) -- - if (LZ4_VENDORED) - add_dependencies (lz4 lz4_ep) - if (INSTALL_VENDORED_LIBS) -@@ -231,8 +219,8 @@ endif () - # ---------------------------------------------------------------------- - # Protobuf - --if (NOT "${PROTOBUF_HOME}" STREQUAL "") -- find_package (Protobuf REQUIRED) -+if (1) -+ find_package (Protobuf CONFIG REQUIRED) - set(PROTOBUF_VENDORED FALSE) - else () - set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") -@@ -268,14 +256,6 @@ else () - set(PROTOBUF_VENDORED TRUE) - endif () - --include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) -- --add_library (protobuf STATIC IMPORTED) --set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB}) -- --add_library (protoc STATIC IMPORTED) --set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB}) -- - if (PROTOBUF_VENDORED) - add_dependencies (protoc protobuf_ep) - add_dependencies (protobuf protobuf_ep) -diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt -index 667fab4..7745fe0 100644 ---- a/tools/src/CMakeLists.txt -+++ b/tools/src/CMakeLists.txt -@@ -49,7 +49,6 @@ add_executable (orc-metadata - - target_link_libraries (orc-metadata - orc -- protobuf - ) - - add_executable (orc-statistics -@@ -88,4 +87,7 @@ install(TARGETS - orc-contents - orc-metadata - orc-statistics -- DESTINATION bin) -+ orc-scan -+ orc-memory -+ csv-import -+ DESTINATION tools/orc) +diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt +index 3d4a162..6926bc3 100644 +--- a/c++/src/CMakeLists.txt ++++ b/c++/src/CMakeLists.txt +@@ -230,12 +230,13 @@ endif(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::lz4 ++ libzstd ++ ${LIBHDFSPP_LIBRARIES} + ) + + install(TARGETS orc DESTINATION lib) +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index 3a35325..56ffd74 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -59,8 +59,8 @@ endif () + # ---------------------------------------------------------------------- + # Snappy + +-if (NOT "${SNAPPY_HOME}" STREQUAL "") +- find_package (Snappy REQUIRED) ++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 () + 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}) +- + if (SNAPPY_VENDORED) + add_dependencies (snappy snappy_ep) + if (INSTALL_VENDORED_LIBS) +@@ -93,7 +89,7 @@ endif () + # ---------------------------------------------------------------------- + # ZLIB + +-if (NOT "${ZLIB_HOME}" STREQUAL "") ++if (1) + find_package (ZLIB REQUIRED) + set(ZLIB_VENDORED FALSE) + else () +@@ -120,10 +116,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}) +- + if (ZLIB_VENDORED) + add_dependencies (zlib zlib_ep) + if (INSTALL_VENDORED_LIBS) +@@ -135,8 +127,8 @@ endif () + # ---------------------------------------------------------------------- + # Zstd + +-if (NOT "${ZSTD_HOME}" STREQUAL "") +- find_package (ZSTD REQUIRED) ++if (1) ++ find_package (zstd CONFIG REQUIRED) + 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) +@@ -184,8 +172,8 @@ endif () + # ---------------------------------------------------------------------- + # LZ4 + +-if (NOT "${LZ4_HOME}" STREQUAL "") +- find_package (LZ4 REQUIRED) ++if (1) ++ find_package (lz4 CONFIG REQUIRED) + set(LZ4_VENDORED FALSE) + else () + set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install") +@@ -211,10 +199,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}) +- + if (LZ4_VENDORED) + add_dependencies (lz4 lz4_ep) + if (INSTALL_VENDORED_LIBS) +@@ -288,8 +272,8 @@ endif () + # ---------------------------------------------------------------------- + # Protobuf + +-if (NOT "${PROTOBUF_HOME}" STREQUAL "") +- find_package (Protobuf REQUIRED) ++if (1) ++ find_package (Protobuf CONFIG REQUIRED) + set(PROTOBUF_VENDORED FALSE) + else () + set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") +@@ -327,12 +311,6 @@ endif () + + include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) + +-add_library (protobuf STATIC IMPORTED) +-set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB}) +- +-add_library (protoc STATIC IMPORTED) +-set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB}) +- + if (PROTOBUF_VENDORED) + add_dependencies (protoc protobuf_ep) + add_dependencies (protobuf protobuf_ep) +diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt +index f5a53ca..ec22e7a 100644 +--- a/tools/src/CMakeLists.txt ++++ b/tools/src/CMakeLists.txt +@@ -51,7 +51,6 @@ add_executable (orc-metadata + + target_link_libraries (orc-metadata + orc +- protobuf + ${CMAKE_THREAD_LIBS_INIT} + ) + +@@ -92,7 +91,7 @@ target_link_libraries (csv-import + ) + + install(TARGETS +- orc-contents +- orc-metadata +- orc-statistics +- DESTINATION bin) ++ orc-scan ++ orc-memory ++ csv-import ++ DESTINATION tools/orc) diff --git a/ports/orc/0004-update-tzdata.patch b/ports/orc/0004-update-tzdata.patch deleted file mode 100644 index fa9ae2fada6685..00000000000000 --- a/ports/orc/0004-update-tzdata.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 index 4b81fd2a42d570..95ac592d8b96a5 100644 --- a/ports/orc/0005-disable-tzdata.patch +++ b/ports/orc/0005-disable-tzdata.patch @@ -1,31 +1,30 @@ -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/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt +index ea39023..599d79a 100644 +--- a/c++/test/CMakeLists.txt ++++ b/c++/test/CMakeLists.txt +@@ -67,6 +67,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) +@@ -86,3 +87,4 @@ if (WIN32) + ENVIRONMENT "TZDIR=${TZDATA_DIR}" + ) + endif () ++endif() +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index 3a35325..364470b 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -226,7 +226,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 f3db7ee4e90e03..c3a1ff40f2dca3 100644 --- a/ports/orc/CONTROL +++ b/ports/orc/CONTROL @@ -1,5 +1,5 @@ Source: orc -Version: 1.5.9 +Version: 1.6.4 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/portfile.cmake b/ports/orc/portfile.cmake index e907e7bfafcbfe..722b6a10a5f0b5 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/orc - REF 32be030290905de9c2cd5b8cd84e210d8c0cf25c # rel/release-1.5.9 - SHA512 91af28d2ceb25a2e09073ab0b1cfc8e5f797bce690300c9548c5e80d50b5daac935842ae4073d157d218d70105a2c9f54297151d0ab210f304bc11d2e93ac6d1 + REF 23ecc03e87548f6d6783c2d8af2b46672c52214c # rel/release-1.6.4 + SHA512 907984c7e036ddaa90e7cbfabb9af4f6fd3520820b9a8732b304f2213030f7d67cef89ad87d50e028a51bff06f68ff359345ad6894850e299b2fca343d7c0c3e HEAD_REF master PATCHES - 0003-dependencies-from-vcpkg.patch - 0004-update-tzdata.patch - 0005-disable-tzdata.patch + 0003-dependencies-from-vcpkg.patch + 0005-disable-tzdata.patch ) file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake") @@ -23,7 +22,7 @@ else() set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc) endif() -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_WINDOWS) set(BUILD_TOOLS OFF) else() set(BUILD_TOOLS ON) From 00c2a5f5e5f571cfc757cf13ccb42b85698a6318 Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 24 Sep 2020 01:11:42 -0700 Subject: [PATCH 2/2] Update patch format --- ports/orc/0003-dependencies-from-vcpkg.patch | 324 +++++++++---------- ports/orc/0005-disable-tzdata.patch | 60 ++-- 2 files changed, 192 insertions(+), 192 deletions(-) diff --git a/ports/orc/0003-dependencies-from-vcpkg.patch b/ports/orc/0003-dependencies-from-vcpkg.patch index fb523770f7cb09..f753bbcb38d4c1 100644 --- a/ports/orc/0003-dependencies-from-vcpkg.patch +++ b/ports/orc/0003-dependencies-from-vcpkg.patch @@ -1,162 +1,162 @@ -diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 3d4a162..6926bc3 100644 ---- a/c++/src/CMakeLists.txt -+++ b/c++/src/CMakeLists.txt -@@ -230,12 +230,13 @@ endif(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::lz4 -+ libzstd -+ ${LIBHDFSPP_LIBRARIES} - ) - - install(TARGETS orc DESTINATION lib) -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 3a35325..56ffd74 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -59,8 +59,8 @@ endif () - # ---------------------------------------------------------------------- - # Snappy - --if (NOT "${SNAPPY_HOME}" STREQUAL "") -- find_package (Snappy REQUIRED) -+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 () - 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}) -- - if (SNAPPY_VENDORED) - add_dependencies (snappy snappy_ep) - if (INSTALL_VENDORED_LIBS) -@@ -93,7 +89,7 @@ endif () - # ---------------------------------------------------------------------- - # ZLIB - --if (NOT "${ZLIB_HOME}" STREQUAL "") -+if (1) - find_package (ZLIB REQUIRED) - set(ZLIB_VENDORED FALSE) - else () -@@ -120,10 +116,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}) -- - if (ZLIB_VENDORED) - add_dependencies (zlib zlib_ep) - if (INSTALL_VENDORED_LIBS) -@@ -135,8 +127,8 @@ endif () - # ---------------------------------------------------------------------- - # Zstd - --if (NOT "${ZSTD_HOME}" STREQUAL "") -- find_package (ZSTD REQUIRED) -+if (1) -+ find_package (zstd CONFIG REQUIRED) - 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) -@@ -184,8 +172,8 @@ endif () - # ---------------------------------------------------------------------- - # LZ4 - --if (NOT "${LZ4_HOME}" STREQUAL "") -- find_package (LZ4 REQUIRED) -+if (1) -+ find_package (lz4 CONFIG REQUIRED) - set(LZ4_VENDORED FALSE) - else () - set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install") -@@ -211,10 +199,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}) -- - if (LZ4_VENDORED) - add_dependencies (lz4 lz4_ep) - if (INSTALL_VENDORED_LIBS) -@@ -288,8 +272,8 @@ endif () - # ---------------------------------------------------------------------- - # Protobuf - --if (NOT "${PROTOBUF_HOME}" STREQUAL "") -- find_package (Protobuf REQUIRED) -+if (1) -+ find_package (Protobuf CONFIG REQUIRED) - set(PROTOBUF_VENDORED FALSE) - else () - set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") -@@ -327,12 +311,6 @@ endif () - - include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) - --add_library (protobuf STATIC IMPORTED) --set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB}) -- --add_library (protoc STATIC IMPORTED) --set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB}) -- - if (PROTOBUF_VENDORED) - add_dependencies (protoc protobuf_ep) - add_dependencies (protobuf protobuf_ep) -diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt -index f5a53ca..ec22e7a 100644 ---- a/tools/src/CMakeLists.txt -+++ b/tools/src/CMakeLists.txt -@@ -51,7 +51,6 @@ add_executable (orc-metadata - - target_link_libraries (orc-metadata - orc -- protobuf - ${CMAKE_THREAD_LIBS_INIT} - ) - -@@ -92,7 +91,7 @@ target_link_libraries (csv-import - ) - - install(TARGETS -- orc-contents -- orc-metadata -- orc-statistics -- DESTINATION bin) -+ orc-scan -+ orc-memory -+ csv-import -+ DESTINATION tools/orc) +diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt +index 3d4a162..6926bc3 100644 +--- a/c++/src/CMakeLists.txt ++++ b/c++/src/CMakeLists.txt +@@ -230,12 +230,13 @@ endif(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::lz4 ++ libzstd ++ ${LIBHDFSPP_LIBRARIES} + ) + + install(TARGETS orc DESTINATION lib) +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index 3a35325..56ffd74 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -59,8 +59,8 @@ endif () + # ---------------------------------------------------------------------- + # Snappy + +-if (NOT "${SNAPPY_HOME}" STREQUAL "") +- find_package (Snappy REQUIRED) ++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 () + 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}) +- + if (SNAPPY_VENDORED) + add_dependencies (snappy snappy_ep) + if (INSTALL_VENDORED_LIBS) +@@ -93,7 +89,7 @@ endif () + # ---------------------------------------------------------------------- + # ZLIB + +-if (NOT "${ZLIB_HOME}" STREQUAL "") ++if (1) + find_package (ZLIB REQUIRED) + set(ZLIB_VENDORED FALSE) + else () +@@ -120,10 +116,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}) +- + if (ZLIB_VENDORED) + add_dependencies (zlib zlib_ep) + if (INSTALL_VENDORED_LIBS) +@@ -135,8 +127,8 @@ endif () + # ---------------------------------------------------------------------- + # Zstd + +-if (NOT "${ZSTD_HOME}" STREQUAL "") +- find_package (ZSTD REQUIRED) ++if (1) ++ find_package (zstd CONFIG REQUIRED) + 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) +@@ -184,8 +172,8 @@ endif () + # ---------------------------------------------------------------------- + # LZ4 + +-if (NOT "${LZ4_HOME}" STREQUAL "") +- find_package (LZ4 REQUIRED) ++if (1) ++ find_package (lz4 CONFIG REQUIRED) + set(LZ4_VENDORED FALSE) + else () + set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install") +@@ -211,10 +199,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}) +- + if (LZ4_VENDORED) + add_dependencies (lz4 lz4_ep) + if (INSTALL_VENDORED_LIBS) +@@ -288,8 +272,8 @@ endif () + # ---------------------------------------------------------------------- + # Protobuf + +-if (NOT "${PROTOBUF_HOME}" STREQUAL "") +- find_package (Protobuf REQUIRED) ++if (1) ++ find_package (Protobuf CONFIG REQUIRED) + set(PROTOBUF_VENDORED FALSE) + else () + set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") +@@ -327,12 +311,6 @@ endif () + + include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) + +-add_library (protobuf STATIC IMPORTED) +-set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB}) +- +-add_library (protoc STATIC IMPORTED) +-set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB}) +- + if (PROTOBUF_VENDORED) + add_dependencies (protoc protobuf_ep) + add_dependencies (protobuf protobuf_ep) +diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt +index f5a53ca..ec22e7a 100644 +--- a/tools/src/CMakeLists.txt ++++ b/tools/src/CMakeLists.txt +@@ -51,7 +51,6 @@ add_executable (orc-metadata + + target_link_libraries (orc-metadata + orc +- protobuf + ${CMAKE_THREAD_LIBS_INIT} + ) + +@@ -92,7 +91,7 @@ target_link_libraries (csv-import + ) + + install(TARGETS +- orc-contents +- orc-metadata +- orc-statistics +- DESTINATION bin) ++ orc-scan ++ orc-memory ++ csv-import ++ DESTINATION tools/orc) diff --git a/ports/orc/0005-disable-tzdata.patch b/ports/orc/0005-disable-tzdata.patch index 95ac592d8b96a5..829bd18b1fd3f4 100644 --- a/ports/orc/0005-disable-tzdata.patch +++ b/ports/orc/0005-disable-tzdata.patch @@ -1,30 +1,30 @@ -diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt -index ea39023..599d79a 100644 ---- a/c++/test/CMakeLists.txt -+++ b/c++/test/CMakeLists.txt -@@ -67,6 +67,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) -@@ -86,3 +87,4 @@ if (WIN32) - ENVIRONMENT "TZDIR=${TZDATA_DIR}" - ) - endif () -+endif() -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 3a35325..364470b 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -226,7 +226,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/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt +index ea39023..599d79a 100644 +--- a/c++/test/CMakeLists.txt ++++ b/c++/test/CMakeLists.txt +@@ -67,6 +67,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) +@@ -86,3 +87,4 @@ if (WIN32) + ENVIRONMENT "TZDIR=${TZDATA_DIR}" + ) + endif () ++endif() +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index 3a35325..364470b 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -226,7 +226,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