aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Felton <39185762+philjdf@users.noreply.github.com>2019-07-24 01:36:59 +0100
committerGriffin Downs <35574547+grdowns@users.noreply.github.com>2019-07-23 17:36:59 -0700
commitea9d29c05b110f203184eb4602b23325557de9c3 (patch)
treeefd461c05efcab27ecddc159d6cfcb88e7791d74
parent0079c186f0fd8f8f64afc7e0796dd2aa2882e2e3 (diff)
downloadvcpkg-ea9d29c05b110f203184eb4602b23325557de9c3.tar.gz
vcpkg-ea9d29c05b110f203184eb4602b23325557de9c3.zip
[Arrow] Update to Arrow v0.14.1 (#7211)
* Arrow 0.14 update * Find Thrift compiler on Linux * Arrow 0.14.1 * Arrow 0.14.1
-rw-r--r--ports/arrow/CONTROL2
-rw-r--r--ports/arrow/all.patch333
-rw-r--r--ports/arrow/findzstd.patch79
-rw-r--r--ports/arrow/msvc-libname.patch13
-rw-r--r--ports/arrow/portfile.cmake6
5 files changed, 86 insertions, 347 deletions
diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL
index ada95e2d0..ea787e24a 100644
--- a/ports/arrow/CONTROL
+++ b/ports/arrow/CONTROL
@@ -1,5 +1,5 @@
Source: arrow
-Version: 0.13.0-4
+Version: 0.14.1
Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser
Homepage: https://github.com/apache/arrow
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
index 3257dc437..0675356ff 100644
--- a/ports/arrow/all.patch
+++ b/ports/arrow/all.patch
@@ -1,120 +1,21 @@
-diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
-index 52081c4..e1e13b5 100644
---- a/cpp/CMakeLists.txt
-+++ b/cpp/CMakeLists.txt
-@@ -804,6 +804,9 @@ if(ARROW_USE_GLOG)
- list(APPEND ARROW_LINK_LIBS GLOG::glog)
- list(APPEND ARROW_STATIC_LINK_LIBS GLOG::glog)
- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS GLOG::glog)
-+ if(ARROW_NEED_GFLAGS)
-+ list(APPEND ARROW_STATIC_LINK_LIBS gflags::gflags)
-+ endif()
- add_definitions("-DARROW_USE_GLOG")
- endif()
-
-diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake
-index e1429a2..6dee036 100644
---- a/cpp/cmake_modules/FindBrotli.cmake
-+++ b/cpp/cmake_modules/FindBrotli.cmake
-@@ -18,6 +18,7 @@
- # find_package(Brotli)
-
- pkg_check_modules(BROTLI_PC libbrotlicommon libbrotlienc libbrotlidec)
-+
- if(BROTLI_PC_FOUND)
- set(BROTLI_INCLUDE_DIR "${BROTLI_PC_libbrotlicommon_INCLUDEDIR}")
-
-@@ -25,80 +26,16 @@ if(BROTLI_PC_FOUND)
- list(APPEND BROTLI_PC_LIBRARY_DIRS "${BROTLI_PC_libbrotlicommon_LIBDIR}")
- list(APPEND BROTLI_PC_LIBRARY_DIRS "${BROTLI_PC_libbrotlienc_LIBDIR}")
- list(APPEND BROTLI_PC_LIBRARY_DIRS "${BROTLI_PC_libbrotlidec_LIBDIR}")
--
-- find_library(BROTLI_COMMON_LIBRARY brotlicommon
-- PATHS ${BROTLI_PC_LIBRARY_DIRS}
-- NO_DEFAULT_PATH)
-- find_library(BROTLI_ENC_LIBRARY brotlienc
-- PATHS ${BROTLI_PC_LIBRARY_DIRS}
-- NO_DEFAULT_PATH)
-- find_library(BROTLI_DEC_LIBRARY brotlidec
-- PATHS ${BROTLI_PC_LIBRARY_DIRS}
-- NO_DEFAULT_PATH)
- elseif(BROTLI_ROOT)
-- find_library(
-- BROTLI_COMMON_LIBRARY
-- NAMES brotlicommon
-- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlicommon${CMAKE_SHARED_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
-- PATH_SUFFIXES "lib64" "lib" "bin"
-- NO_DEFAULT_PATH)
-- find_library(
-- BROTLI_ENC_LIBRARY
-- NAMES brotlienc
-- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlienc${CMAKE_SHARED_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
-- PATH_SUFFIXES "lib64" "lib" "bin"
-- NO_DEFAULT_PATH)
-- find_library(
-- BROTLI_DEC_LIBRARY
-- NAMES brotlidec
-- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlidec${CMAKE_SHARED_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
-- PATH_SUFFIXES "lib64" "lib" "bin"
-- NO_DEFAULT_PATH)
-- find_path(BROTLI_INCLUDE_DIR
-- NAMES brotli/decode.h
-- PATHS ${BROTLI_ROOT} "${BROTLI_ROOT}/Library"
-- NO_DEFAULT_PATH
-- PATH_SUFFIXES "include")
-+ find_path(BROTLI_INCLUDE_DIR NAMES brotli/decode.h PATH_SUFFIXES "include")
- else()
-- find_library(
-- BROTLI_COMMON_LIBRARY
-- NAMES brotlicommon
-- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlicommon${CMAKE_SHARED_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- PATH_SUFFIXES "lib64" "lib" "bin")
-- find_library(
-- BROTLI_ENC_LIBRARY
-- NAMES brotlienc
-- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlienc${CMAKE_SHARED_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- PATH_SUFFIXES "lib64" "lib" "bin")
-- find_library(
-- BROTLI_DEC_LIBRARY
-- NAMES brotlidec
-- ${CMAKE_SHARED_LIBRARY_PREFIX}brotlidec${CMAKE_SHARED_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec-static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- ${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec_static${CMAKE_STATIC_LIBRARY_SUFFIX}
-- PATH_SUFFIXES "lib64" "lib" "bin")
- find_path(BROTLI_INCLUDE_DIR NAMES brotli/decode.h PATH_SUFFIXES "include")
- endif()
+diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
+index 4ef2948..9c3c121 100644
+--- a/cpp/cmake_modules/BuildUtils.cmake
++++ b/cpp/cmake_modules/BuildUtils.cmake
+@@ -305,7 +305,7 @@ function(ADD_ARROW_LIB LIB_NAME)
+ target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES})
+ endif()
-+find_library(BROTLI_COMMON_LIBRARY NAMES brotlicommon brotlicommon-static libbrotlicommon libbrotlicommon-static)
-+find_library(BROTLI_ENC_LIBRARY NAMES libbrotlienc libbrotlienc-static brotlienc brotlienc-static)
-+find_library(BROTLI_DEC_LIBRARY NAMES brotlidec libbrotlidec libbrotlidec-static brotlidec brotlidec-static)
-+
- find_package_handle_standard_args(Brotli
- REQUIRED_VARS
- BROTLI_COMMON_LIBRARY
+- if(MSVC)
++ if(MSVC AND 0)
+ set(LIB_NAME_STATIC ${LIB_NAME}_static)
+ else()
+ set(LIB_NAME_STATIC ${LIB_NAME})
diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake
-index 3606f5c..1d18b7c 100644
+index 8410916..a196b25 100644
--- a/cpp/cmake_modules/FindLz4.cmake
+++ b/cpp/cmake_modules/FindLz4.cmake
-@@ -19,24 +19,26 @@ if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX)
+@@ -19,14 +19,16 @@ if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX)
set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static")
endif()
@@ -126,42 +27,36 @@ index 3606f5c..1d18b7c 100644
-set(LZ4_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_STATIC_LIB_SUFFIX})
+set(LZ4_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_MSVC_STATIC_LIB_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
- pkg_check_modules(LZ4_PC liblz4)
- if(LZ4_PC_FOUND)
- set(LZ4_INCLUDE_DIR "${LZ4_PC_INCLUDEDIR}")
-
- list(APPEND LZ4_PC_LIBRARY_DIRS "${LZ4_PC_LIBDIR}")
-- find_library(LZ4_LIB lz4
-+ find_library(LZ4_LIB lz4${LZ4_LIB_NAME_DEBUG_SUFFIX}
- PATHS ${LZ4_PC_LIBRARY_DIRS}
- NO_DEFAULT_PATH
- PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
- elseif(LZ4_ROOT)
+ if(LZ4_ROOT)
find_library(
LZ4_LIB
- NAMES lz4 ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
-- "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ NAMES lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
-+ "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX}"
- PATHS ${LZ4_ROOT} "${LZ4_ROOT}/Library"
- PATH_SUFFIXES "lib64" "lib" "bin"
- NO_DEFAULT_PATH)
-@@ -48,8 +50,8 @@ elseif(LZ4_ROOT)
- else()
- find_library(
- LZ4_LIB
-- NAMES lz4 ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
-- "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}"
-+ NAMES lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
-+ "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX}"
- PATH_SUFFIXES "lib64" "lib" "bin")
- find_path(LZ4_INCLUDE_DIR NAMES lz4.h PATH_SUFFIXES "include")
- endif()
+ "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ PATHS ${LZ4_ROOT}
+ PATH_SUFFIXES ${LIB_PATH_SUFFIXES}
+@@ -43,14 +45,14 @@ else()
+ set(LZ4_INCLUDE_DIR "${LZ4_PC_INCLUDEDIR}")
+
+ list(APPEND LZ4_PC_LIBRARY_DIRS "${LZ4_PC_LIBDIR}")
+- find_library(LZ4_LIB lz4
++ find_library(LZ4_LIB lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
+ PATHS ${LZ4_PC_LIBRARY_DIRS}
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
+ else()
+ find_library(
+ LZ4_LIB
+- NAMES lz4 ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
++ NAMES lz4${LZ4_LIB_NAME_DEBUG_SUFFIX} ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
+ "${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
+ find_path(LZ4_INCLUDE_DIR NAMES lz4.h PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES})
diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThrift.cmake
-index a4decf7..78ec7c8 100644
+index 87cc24e..4de0760 100644
--- a/cpp/cmake_modules/FindThrift.cmake
+++ b/cpp/cmake_modules/FindThrift.cmake
-@@ -65,6 +65,10 @@ if(MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX)
+@@ -54,6 +54,10 @@ if(MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX)
set(THRIFT_MSVC_STATIC_LIB_SUFFIX md)
endif()
@@ -169,33 +64,33 @@ index a4decf7..78ec7c8 100644
+ set(THRIFT_LIB_NAME_DEBUG_SUFFIX d)
+endif()
+
- pkg_check_modules(THRIFT_PC thrift)
-
- # THRIFT-4760: The pkgconfig files are currently only installed when using autotools.
-@@ -74,15 +78,13 @@ if(THRIFT_PC_FOUND)
-
- list(APPEND THRIFT_PC_LIBRARY_DIRS "${THRIFT_PC_LIBDIR}")
-
-- find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
-- PATHS ${THRIFT_PC_LIBRARY_DIRS}
-- NO_DEFAULT_PATH)
-+ find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}
-+ PATHS ${THRIFT_PC_LIBRARY_DIRS})
- find_program(THRIFT_COMPILER thrift
- HINTS ${THRIFT_PC_PREFIX}
-- NO_DEFAULT_PATH
- PATH_SUFFIXES "bin")
- else()
-- find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
-+ find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}
- HINTS ${Thrift_ROOT}
- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib")
- find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h
+ if(Thrift_ROOT)
+ find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
+ PATHS ${Thrift_ROOT}
+@@ -71,15 +75,13 @@ else()
+
+ list(APPEND THRIFT_PC_LIBRARY_DIRS "${THRIFT_PC_LIBDIR}")
+
+- find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
+- PATHS ${THRIFT_PC_LIBRARY_DIRS}
+- NO_DEFAULT_PATH)
++ find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}
++ PATHS ${THRIFT_PC_LIBRARY_DIRS})
+ find_program(THRIFT_COMPILER thrift
+ HINTS ${THRIFT_PC_PREFIX}
+- NO_DEFAULT_PATH
+ PATH_SUFFIXES "bin")
+ else()
+- find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}
++ find_library(THRIFT_STATIC_LIB thrift${THRIFT_MSVC_STATIC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}
+ PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib")
+ find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h PATH_SUFFIXES "include")
+ find_program(THRIFT_COMPILER thrift PATH_SUFFIXES "bin")
diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake
-index 17b58a3..fa2ab05 100644
+index 8e47086..d7ce559 100644
--- a/cpp/cmake_modules/FindZSTD.cmake
+++ b/cpp/cmake_modules/FindZSTD.cmake
-@@ -19,7 +19,11 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
+@@ -19,14 +19,18 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
endif()
@@ -207,91 +102,29 @@ index 17b58a3..fa2ab05 100644
+set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
- pkg_check_modules(ZSTD_PC libzstd)
-@@ -27,18 +31,15 @@ if(ZSTD_PC_FOUND)
- set(ZSTD_INCLUDE_DIR "${ZSTD_PC_INCLUDEDIR}")
-
- list(APPEND ZSTD_PC_LIBRARY_DIRS "${ZSTD_PC_LIBDIR}")
-- find_library(ZSTD_LIB zstd
-+ find_library(ZSTD_LIB zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}
- PATHS ${ZSTD_PC_LIBRARY_DIRS}
- NO_DEFAULT_PATH
- PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
- elseif(ZSTD_ROOT)
+ # First, find via if specified ZTD_ROOT
+ if(ZSTD_ROOT)
message(STATUS "Using ZSTD_ROOT: ${ZSTD_ROOT}")
find_library(ZSTD_LIB
- NAMES zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-- "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
-- PATHS ${ZSTD_ROOT} "${ZSTD_ROOT}/Library"
-- PATH_SUFFIXES "lib64" "lib" "bin"
-- NO_DEFAULT_PATH)
-+ NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-+ "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
- find_path(ZSTD_INCLUDE_DIR
- NAMES zstd.h
- PATHS ${ZSTD_ROOT} "${ZSTD_ROOT}/Library"
-@@ -46,9 +47,8 @@ elseif(ZSTD_ROOT)
- PATH_SUFFIXES "include")
- else()
- find_library(ZSTD_LIB
-- NAMES zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-- "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
-- PATH_SUFFIXES "lib64" "lib" "bin")
+ NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-+ "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
- find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES "include")
- endif()
-
-diff --git a/cpp/cmake_modules/FindgflagsAlt.cmake b/cpp/cmake_modules/FindgflagsAlt.cmake
-index a9b8684..fdb815a 100644
---- a/cpp/cmake_modules/FindgflagsAlt.cmake
-+++ b/cpp/cmake_modules/FindgflagsAlt.cmake
-@@ -15,18 +15,13 @@
- # specific language governing permissions and limitations
- # under the License.
-
--if(gflags_ROOT)
-- find_library(gflags_LIB NAMES gflags PATHS ${gflags_ROOT} NO_DEFAULT_PATH)
-- find_path(GFLAGS_INCLUDE_DIR
-- NAMES gflags/gflags.h
-- PATHS ${gflags_ROOT}
-- NO_DEFAULT_PATH
-- PATH_SUFFIXES "include")
--else()
-- find_library(gflags_LIB NAMES gflags)
-- find_path(GFLAGS_INCLUDE_DIR NAMES gflags/gflags.h PATH_SUFFIXES "include")
-+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-+ set(GFLAGS_LIB_NAME_DEBUG_SUFFIX _debug)
- endif()
-
-+find_library(gflags_LIB NAMES gflags${GFLAGS_LIB_NAME_DEBUG_SUFFIX} gflags_static${GFLAGS_LIB_NAME_DEBUG_SUFFIX})
-+find_path(GFLAGS_INCLUDE_DIR NAMES gflags/gflags.h PATH_SUFFIXES "include")
-+
- find_package_handle_standard_args(gflagsAlt REQUIRED_VARS gflags_LIB GFLAGS_INCLUDE_DIR)
-
- if(gflagsAlt_FOUND)
-diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
-index bdb122b..58c123e 100644
---- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
-+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
-@@ -923,10 +923,7 @@ if(ARROW_NEED_GFLAGS)
- elseif(gflags_SOURCE STREQUAL "SYSTEM")
- # gflagsConfig.cmake is not installed on Ubuntu/Debian
- # TODO: Make a bug report upstream
-- find_package(gflags)
-- if(NOT gflags_FOUND)
-- find_package(gflagsAlt REQUIRED)
-- endif()
-+ find_package(gflagsAlt REQUIRED)
- endif()
- # TODO: Don't use global includes but rather target_include_directories
- include_directories(SYSTEM ${GFLAGS_INCLUDE_DIR})
-@@ -1558,7 +1555,7 @@ if(ARROW_WITH_FLATBUFFERS)
- elseif(Flatbuffers_SOURCE STREQUAL "BUNDLED")
- build_flatbuffers()
- elseif(Flatbuffers_SOURCE STREQUAL "SYSTEM")
-- find_package(Flatbuffers QUIET)
-+ #find_package(Flatbuffers QUIET) - disabled because on vcpkg this looks in the wrong place for the fb compiler and causes an error
- if(NOT Flatbuffers_FOUND)
- find_package(FlatbuffersAlt REQUIRED)
- endif()
+ "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ PATHS ${ZSTD_ROOT}
+ PATH_SUFFIXES ${LIB_PATH_SUFFIXES}
+@@ -44,14 +48,14 @@ else()
+ set(ZSTD_INCLUDE_DIR "${ZSTD_PC_INCLUDEDIR}")
+
+ list(APPEND ZSTD_PC_LIBRARY_DIRS "${ZSTD_PC_LIBDIR}")
+- find_library(ZSTD_LIB zstd
++ find_library(ZSTD_LIB zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}
+ PATHS ${ZSTD_PC_LIBRARY_DIRS}
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
+ # Third, check all other CMake paths
+ else()
+ find_library(ZSTD_LIB
+- NAMES zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
++ NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
+ "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
+ find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES})
diff --git a/ports/arrow/findzstd.patch b/ports/arrow/findzstd.patch
deleted file mode 100644
index ac77202f9..000000000
--- a/ports/arrow/findzstd.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake
-index 21b4981ec..818e4b5e1 100644
---- a/cpp/cmake_modules/FindZSTD.cmake
-+++ b/cpp/cmake_modules/FindZSTD.cmake
-@@ -19,44 +19,60 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
- set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
- endif()
-
--if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-- set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
--endif()
--
-+set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
--set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-+set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}")
- set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
-
-+set(ZSTD_LIB_NAMES_RELEASE zstd "${ZSTD_STATIC_LIB_NAME}"
-+ "${CMAKE_SHARED_LIBRARY_PREFIX}zstd")
-+set(ZSTD_LIB_NAMES_DEBUG)
-+foreach(_zstd_name ${ZSTD_LIB_NAMES_RELEASE})
-+ list(APPEND ZSTD_LIB_NAMES_DEBUG ${_zstd_name}${ZSTD_LIB_NAME_DEBUG_SUFFIX})
-+ if(DEFINED CMAKE_DEBUG_POSTFIX)
-+ list(APPEND ZSTD_LIB_NAMES_DEBUG ${_zstd_name}${CMAKE_DEBUG_POSTFIX})
-+ endif()
-+endforeach()
-+
- pkg_check_modules(ZSTD_PC libzstd)
- if(ZSTD_PC_FOUND)
- set(ZSTD_INCLUDE_DIR "${ZSTD_PC_INCLUDEDIR}")
-
- list(APPEND ZSTD_PC_LIBRARY_DIRS "${ZSTD_PC_LIBDIR}")
-- find_library(ZSTD_LIB zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}
-+ find_library(ZSTD_LIBRARY_RELEASE ${ZSTD_LIB_NAMES_RELEASE}
- PATHS ${ZSTD_PC_LIBRARY_DIRS}
- NO_DEFAULT_PATH
- PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
-+ find_library(ZSTD_LIBRARY_DEBUG ${ZSTD_LIB_NAMES_DEBUG}
-+ PATHS ${ZSTD_PC_LIBRARY_DIRS}
-+ NO_DEFAULT_PATH
-+ PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
-+
- elseif(ZSTD_ROOT)
- message(STATUS "Using ZSTD_ROOT: ${ZSTD_ROOT}")
-- find_library(ZSTD_LIB
-- NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-- "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-+ find_library(ZSTD_LIBRARY_RELEASE
-+ NAMES ${ZSTD_LIB_NAMES_RELEASE})
-+ find_library(ZSTD_LIBRARY_DEBUG
-+ NAMES ${ZSTD_LIB_NAMES_DEBUG})
- find_path(ZSTD_INCLUDE_DIR
- NAMES zstd.h
- PATHS ${ZSTD_ROOT} "${ZSTD_ROOT}/Library"
- NO_DEFAULT_PATH
- PATH_SUFFIXES "include")
- else()
-- find_library(ZSTD_LIB
-- NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-- "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-+ find_library(ZSTD_LIBRARY_RELEASE
-+ NAMES ${ZSTD_LIB_NAMES_RELEASE})
-+ find_library(ZSTD_LIBRARY_DEBUG
-+ NAMES ${ZSTD_LIB_NAMES_DEBUG})
- find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES "include")
- endif()
--
-+select_library_configurations(ZSTD)
-+set(ZSTD_LIB ${ZSTD_LIBRARY})
- find_package_handle_standard_args(ZSTD REQUIRED_VARS ZSTD_LIB ZSTD_INCLUDE_DIR)
-
- if(ZSTD_FOUND)
- add_library(ZSTD::zstd UNKNOWN IMPORTED)
- set_target_properties(ZSTD::zstd
-- PROPERTIES IMPORTED_LOCATION "${ZSTD_LIB}"
-+ PROPERTIES IMPORTED_LOCATION_RELEASE "${ZSTD_LIBRARY_RELEASE}"
-+ IMPORTED_LOCATION_DEBUG "${ZSTD_LIBRARY_DEBUG}"
- INTERFACE_INCLUDE_DIRECTORIES "${ZSTD_INCLUDE_DIR}")
- endif()
diff --git a/ports/arrow/msvc-libname.patch b/ports/arrow/msvc-libname.patch
deleted file mode 100644
index a997822d0..000000000
--- a/ports/arrow/msvc-libname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
-index 0f014ba..fd2e7b3 100644
---- a/cpp/cmake_modules/BuildUtils.cmake
-+++ b/cpp/cmake_modules/BuildUtils.cmake
-@@ -289,7 +289,7 @@ function(ADD_ARROW_LIB LIB_NAME)
- target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES})
- endif()
-
-- if(MSVC)
-+ if(MSVC AND 0)
- set(LIB_NAME_STATIC ${LIB_NAME}_static)
- else()
- set(LIB_NAME_STATIC ${LIB_NAME})
diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
index fd8fd52fc..58b6f489c 100644
--- a/ports/arrow/portfile.cmake
+++ b/ports/arrow/portfile.cmake
@@ -7,13 +7,11 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/arrow
- REF apache-arrow-0.13.0
- SHA512 bbb14d11abf267a6902c7c9e0215ba7c5284f07482be2de42707145265d2809c89c2d4d8f8b918fdb8c33a5ecbd650875b987a1a694cdf653e766822be67a47d
+ REF apache-arrow-0.14.1
+ SHA512 f5493a62becaaee9d26e05f33509f51c98e96a5efd5d5bbdffdf70456c254b62075f1c9bc63d1119289a22d00359dfe9862078a284f8e063ecf13bd338a50728
HEAD_REF master
PATCHES
all.patch
- msvc-libname.patch
- findzstd.patch
)
string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED)