early-access version 2853

externals/vcpkg/ports/orc/0003-dependencies-from-vcpkg.patch

@@ -0,0 +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
++    $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>
++    ${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)

externals/vcpkg/ports/orc/0005-disable-tzdata.patch

@@ -0,0 +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

externals/vcpkg/ports/orc/portfile.cmake

@@ -0,0 +1,72 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO apache/orc
+    REF 23ecc03e87548f6d6783c2d8af2b46672c52214c  # rel/release-1.6.4
+    SHA512 907984c7e036ddaa90e7cbfabb9af4f6fd3520820b9a8732b304f2213030f7d67cef89ad87d50e028a51bff06f68ff359345ad6894850e299b2fca343d7c0c3e
+    HEAD_REF master
+    PATCHES
+        0003-dependencies-from-vcpkg.patch
+        0005-disable-tzdata.patch
+)
+
+file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake_modules/FindLZ4.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZSTD.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake_modules/FindProtobuf.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake_modules/FindSnappy.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZLIB.cmake")
+
+set(PROTOBUF_EXECUTABLE "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+
+if(VCPKG_TARGET_IS_WINDOWS)
+  set(BUILD_TOOLS OFF)
+  # when cross compiling, we can't run their test. however:
+  #  - Windows doesn't support time_t < 0 => HAS_PRE_1970 test returns false
+  #  - Windows doesn't support setenv => HAS_POST_2038 test fails to compile
+  set(time_t_checks "-DHAS_PRE_1970=OFF" "-DHAS_POST_2038=OFF")
+else()
+  set(BUILD_TOOLS ON)
+  set(time_t_checks "")
+endif()
+
+if(VCPKG_TARGET_IS_UWP)
+    set(configure_opts WINDOWS_USE_MSBUILD)
+endif()
+
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
+  ${configure_opts}
+  OPTIONS
+    ${time_t_checks}
+    -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
+  MAYBE_UNUSED_VARIABLES
+    ENABLE_TEST
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/orc-*)
+if(TOOLS)
+  file(COPY ${TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/orc")
+  file(REMOVE ${TOOLS})
+endif()
+
+file(GLOB BINS "${CURRENT_PACKAGES_DIR}/bin/*")
+if(NOT BINS)
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+
+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)

externals/vcpkg/ports/orc/usage

@@ -0,0 +1,11 @@
+The package orc does not provide CMake targets:
+
+    find_package(protobuf CONFIG REQUIRED)
+    find_package(ZLIB REQUIRED)
+    find_package(Snappy CONFIG REQUIRED)
+
+    find_library(LZ4_LIBRARY NAMES lz4d lz4)
+    find_library(ZSTD_LIBRARY NAMES zstd)
+    find_library(ORC_LIBRARY NAMES orc)
+
+    target_link_libraries(main PRIVATE ${ORC_LIBRARY} protobuf::libprotoc protobuf::libprotobuf Snappy::snappy ${LZ4_LIBRARY} ${ZSTD_LIBRARY} ZLIB::ZLIB)

externals/vcpkg/ports/orc/vcpkg.json

@@ -0,0 +1,23 @@
+{
+  "name": "orc",
+  "version": "1.6.4",
+  "port-version": 4,
+  "description": "The smallest, fastest columnar storage for Hadoop workloads.",
+  "homepage": "https://orc.apache.org/",
+  "dependencies": [
+    "gtest",
+    "lz4",
+    "protobuf",
+    {
+      "name": "protobuf",
+      "host": true
+    },
+    "snappy",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    "zlib",
+    "zstd"
+  ]
+}