Merge pull request #1776 from atkawa7/apache-arrow-0.6.0

[arrow] update

3 files changed, 156 insertions, 4 deletions

diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL
index bdfcfef24..78cbf2a18 100644
--- a/ports/arrow/CONTROL
+++ b/ports/arrow/CONTROL
@@ -1,4 +1,4 @@
 Source: arrow
-Version: apache-arrow-0.4.0-2
-Build-Depends: boost
+Version: 0.6.0
+Build-Depends: boost, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags
 Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.
diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch
new file mode 100644
index 000000000..6e0d175c3
--- /dev/null
+++ b/ports/arrow/all.patch
@@ -0,0 +1,130 @@
+diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake
+index f2e714c..2e475dc 100644
+--- a/cmake_modules/FindBrotli.cmake
++++ b/cmake_modules/FindBrotli.cmake
+@@ -65,16 +65,13 @@ if (BROTLI_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR BROTLI_LIBRARIES))
+   set(BROTLI_FOUND TRUE)
+   get_filename_component( BROTLI_LIBS ${BROTLI_LIBRARY_ENC} PATH )
+   set(BROTLI_LIB_NAME brotli)
+-  if (MSVC AND NOT BROTLI_MSVC_STATIC_LIB_SUFFIX)
+-    set(BROTLI_MSVC_STATIC_LIB_SUFFIX _static)
+-  endif()
+   set(BROTLI_STATIC_LIB
+-      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
+-      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
+-      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+-  set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+-  set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+-  set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
++      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_STATIC_LIBRARY_SUFFIX}
++      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_STATIC_LIBRARY_SUFFIX}
++      ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${CMAKE_STATIC_LIBRARY_SUFFIX})
++  set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_STATIC_LIBRARY_SUFFIX})
++  set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_STATIC_LIBRARY_SUFFIX})
++  set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${CMAKE_STATIC_LIBRARY_SUFFIX})
+   set(BROTLI_SHARED_LIB
+       ${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_SHARED_LIBRARY_SUFFIX}
+       ${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_SHARED_LIBRARY_SUFFIX}
+diff --git a/cmake_modules/FindFlatbuffers.cmake b/cmake_modules/FindFlatbuffers.cmake
+index 804f479..ff9bde1 100644
+--- a/cmake_modules/FindFlatbuffers.cmake
++++ b/cmake_modules/FindFlatbuffers.cmake
+@@ -53,6 +53,7 @@ endif ()
+ 
+ find_program(FLATBUFFERS_COMPILER flatc
+   "${FLATBUFFERS_HOME}/bin"
++  "${FLATBUFFERS_HOME}/tools"
+   /usr/local/bin
+   /usr/bin
+   NO_DEFAULT_PATH
+diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake
+index 07707cf..9cbf67d 100644
+--- a/cmake_modules/FindLz4.cmake
++++ b/cmake_modules/FindLz4.cmake
+@@ -29,15 +29,7 @@ elseif ( Lz4_HOME )
+     list( APPEND _lz4_roots ${Lz4_HOME} )
+ endif()
+ 
+-if (MSVC AND NOT LZ4_MSVC_STATIC_LIB_SUFFIX)
+-  set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static")
+-endif()
+-
+-set(LZ4_STATIC_LIB_SUFFIX
+-  "${LZ4_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+-
+-set(LZ4_STATIC_LIB_NAME
+-  ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_STATIC_LIB_SUFFIX})
++set(LZ4_STATIC_LIB_NAME lz4)
+ 
+ find_path(LZ4_INCLUDE_DIR NAMES lz4.h
+   PATHS ${_lz4_roots}
+diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake
+index 867963c..8a432db 100644
+--- a/cmake_modules/FindSnappy.cmake
++++ b/cmake_modules/FindSnappy.cmake
+@@ -55,7 +55,7 @@ if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES))
+   set(SNAPPY_HEADER_NAME snappy.h)
+   set(SNAPPY_HEADER ${SNAPPY_INCLUDE_DIR}/${SNAPPY_HEADER_NAME})
+   set(SNAPPY_LIB_NAME snappy)
+-  set(SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
++  set(SNAPPY_STATIC_LIB ${SNAPPY_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})
+   set(SNAPPY_SHARED_LIB ${SNAPPY_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ else ()
+   set(SNAPPY_FOUND FALSE)
+diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake
+index 78b84f2..eb09001 100644
+--- a/cmake_modules/FindZLIB.cmake
++++ b/cmake_modules/FindZLIB.cmake
+@@ -62,11 +62,11 @@ if (ZLIB_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZLIB_LIBRARIES))
+   set(ZLIB_LIB_NAME z)
+   if (MSVC)
+     if (NOT ZLIB_MSVC_STATIC_LIB_SUFFIX)
+-      set(ZLIB_MSVC_STATIC_LIB_SUFFIX libstatic)
++      set(ZLIB_MSVC_STATIC_LIB_SUFFIX lib)
+     endif()
+     set(ZLIB_MSVC_SHARED_LIB_SUFFIX lib)
+   endif()
+-  set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
++  set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_SHARED_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
+   set(ZLIB_SHARED_LIB ${ZLIB_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_SHARED_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ else ()
+   set(ZLIB_FOUND FALSE)
+diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake
+index 02a0c39..73c61b5 100644
+--- a/cmake_modules/FindZSTD.cmake
++++ b/cmake_modules/FindZSTD.cmake
+@@ -29,21 +29,11 @@ elseif ( ZStd_HOME )
+     list( APPEND _zstd_roots ${ZStd_HOME} )
+ endif()
+ 
+-if (MSVC AND NOT ZSTD_MSVC_STATIC_LIB_SUFFIX)
+-  set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
+-endif()
+-
+-set(ZSTD_STATIC_LIB_SUFFIX
+-  "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+-
+-set(ZSTD_STATIC_LIB_NAME
+-  ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
+-
+ find_path(ZSTD_INCLUDE_DIR NAMES zstd.h
+   PATHS ${_zstd_roots}
+   NO_DEFAULT_PATH
+   PATH_SUFFIXES "include" )
+-find_library(ZSTD_STATIC_LIB NAMES ${ZSTD_STATIC_LIB_NAME} lib${ZSTD_STATIC_LIB_NAME}
++find_library(ZSTD_STATIC_LIB NAMES libzstd libzstd_static zstd zstd_static
+   PATHS ${_zstd_roots}
+   NO_DEFAULT_PATH
+   PATH_SUFFIXES "lib" )
+diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
+index a888e92..0fe3629 100644
+--- a/cmake_modules/ThirdpartyToolchain.cmake
++++ b/cmake_modules/ThirdpartyToolchain.cmake
+@@ -119,6 +119,7 @@ endif()
+ set(Boost_DEBUG TRUE)
+ set(Boost_USE_MULTITHREADED ON)
+ set(Boost_ADDITIONAL_VERSIONS
++  "1.65.0" "1.65"  
+   "1.64.0" "1.64"
+   "1.63.0" "1.63"
+   "1.62.0" "1.61"
diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
index f5cdb1ae4..c70a3cdc3 100644
--- a/ports/arrow/portfile.cmake
+++ b/ports/arrow/portfile.cmake
@@ -7,17 +7,39 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/arrow
-    REF apache-arrow-0.4.0
-    SHA512 cdd67a884528b088688d88c0627b9c13077215e234dd0772797f0bf63319ffc18533276d52110a37a0938d32f006023b74dce93e71d34b1e0003a86761cea6ee
+    REF apache-arrow-0.6.0
+    SHA512  c0e89b959dfe75e895a3427edd4eee663be5ee542e9ea13f7311d0775fe7a00188eafa07ba524e3d3c0a71fc8e11213f10fe4ebfdf451754816062249ffa7f3d
     HEAD_REF master
 )
 
 
 set(CPP_SOURCE_PATH "${SOURCE_PATH}/cpp")
 
+vcpkg_apply_patches(
+    SOURCE_PATH ${CPP_SOURCE_PATH}
+    PATCHES
+    "${CMAKE_CURRENT_LIST_DIR}/all.patch"
+)
+
+
+string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED)
+string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${CPP_SOURCE_PATH}
     OPTIONS -DARROW_BUILD_TESTS=off
+    -DRAPIDJSON_HOME=${CURRENT_INSTALLED_DIR}
+    -DFLATBUFFERS_HOME=${CURRENT_INSTALLED_DIR}
+    -DARROW_ZLIB_VENDORED=ON
+    -DBROTLI_HOME=${CURRENT_INSTALLED_DIR}
+    -DLZ4_HOME=${CURRENT_INSTALLED_DIR}
+    -DZSTD_HOME=${CURRENT_INSTALLED_DIR}
+    -DSNAPPY_HOME=${CURRENT_INSTALLED_DIR}
+    -DBOOST_ROOT=${CURRENT_INSTALLED_DIR}
+    -DGFLAGS_HOME=${CURRENT_INSTALLED_DIR}
+    -DZLIB_HOME=${CURRENT_INSTALLED_DIR}
+    -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC}
+    -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED}
 )
 
 vcpkg_install_cmake()