3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[arrow] Update to 7.0.0 (#23032)

Browse Source 
* Bump version to 7.0.0

* Update version files

* Update patches

* Update version files

* Update patches

* Update version files

* Update patches

* Add license

* Update version files
This commit is contained in:
Ian Cook 2022-02-18 17:33:15 -05:00 committed by GitHub
parent 1604b064f2
commit fc87706409
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/arrow/all.patch
View File

@ -1,5 +1,5 @@
diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
index cd8290d1b..12c52c184 100644
index 391c43e0a..50f6d3d3c 100644
--- a/cpp/cmake_modules/BuildUtils.cmake
+++ b/cpp/cmake_modules/BuildUtils.cmake
@@ -427,7 +427,7 @@ function(ADD_ARROW_LIB LIB_NAME)

63
ports/arrow/fix-dependencies.patch
View File

@ -1,8 +1,8 @@
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index ba8c36e81..eac441dee 100644
index 2d7baf118..ace45d35b 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -689,7 +689,7 @@ endif()
@@ -699,7 +699,7 @@ endif()
if(ARROW_WITH_BROTLI)
# Order is important for static linking
@ -11,7 +11,7 @@ index ba8c36e81..eac441dee 100644
list(APPEND ARROW_LINK_LIBS ${ARROW_BROTLI_LIBS})
list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_BROTLI_LIBS})
if(Brotli_SOURCE STREQUAL "SYSTEM")
@@ -705,9 +705,9 @@ if(ARROW_WITH_BZ2)
@@ -715,9 +715,9 @@ if(ARROW_WITH_BZ2)
endif()
if(ARROW_WITH_LZ4)
@ -23,7 +23,7 @@ index ba8c36e81..eac441dee 100644
endif()
endif()
@@ -764,10 +764,10 @@ if(ARROW_S3)
@@ -787,10 +787,10 @@ if(ARROW_WITH_OPENTELEMETRY)
endif()
if(ARROW_WITH_UTF8PROC)
@ -38,7 +38,7 @@ index ba8c36e81..eac441dee 100644
endif()
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 673a58eed..8c2c1e2fb 100644
index bc389521b..1b358ce70 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -53,7 +53,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES
@ -50,15 +50,16 @@ index 673a58eed..8c2c1e2fb 100644
BZip2
c-ares
gflags
@@ -62,14 +62,14 @@ set(ARROW_THIRDPARTY_DEPENDENCIES
@@ -62,7 +62,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES
gRPC
GTest
LLVM
- Lz4
+ lz4
opentelemetry-cpp
ORC
re2
Protobuf
@@ -70,7 +70,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES
RapidJSON
Snappy
Thrift
@ -67,7 +68,7 @@ index 673a58eed..8c2c1e2fb 100644
xsimd
ZLIB
zstd)
@@ -872,17 +872,7 @@ set(Boost_ADDITIONAL_VERSIONS
@@ -893,17 +893,7 @@ set(Boost_ADDITIONAL_VERSIONS
# so we first need to determine whether we're building it
if(ARROW_WITH_THRIFT AND Thrift_SOURCE STREQUAL "AUTO")
find_package(Thrift 0.11.0 MODULE COMPONENTS ${ARROW_THRIFT_REQUIRED_COMPONENTS})
@ -86,7 +87,7 @@ index 673a58eed..8c2c1e2fb 100644
set(Thrift_SOURCE "BUNDLED")
endif()
endif()
@@ -991,7 +981,7 @@ macro(build_snappy)
@@ -1038,7 +1028,7 @@ macro(build_snappy)
endmacro()
if(ARROW_WITH_SNAPPY)
@ -95,7 +96,7 @@ index 673a58eed..8c2c1e2fb 100644
if(${Snappy_SOURCE} STREQUAL "SYSTEM" AND NOT snappy_PC_FOUND)
get_target_property(SNAPPY_LIB Snappy::snappy IMPORTED_LOCATION)
string(APPEND ARROW_PC_LIBS_PRIVATE " ${SNAPPY_LIB}")
@@ -1061,10 +1051,16 @@ macro(build_brotli)
@@ -1108,10 +1098,16 @@ macro(build_brotli)
endmacro()
if(ARROW_WITH_BROTLI)
@ -115,7 +116,7 @@ index 673a58eed..8c2c1e2fb 100644
include_directories(SYSTEM ${BROTLI_INCLUDE_DIR})
endif()
@@ -1181,7 +1177,7 @@ macro(build_glog)
@@ -1228,7 +1224,7 @@ macro(build_glog)
endmacro()
if(ARROW_USE_GLOG)
@ -124,7 +125,7 @@ index 673a58eed..8c2c1e2fb 100644
# TODO: Don't use global includes but rather target_include_directories
get_target_property(GLOG_INCLUDE_DIR glog::glog INTERFACE_INCLUDE_DIRECTORIES)
include_directories(SYSTEM ${GLOG_INCLUDE_DIR})
@@ -1255,8 +1251,7 @@ endmacro()
@@ -1302,8 +1298,7 @@ endmacro()
if(ARROW_NEED_GFLAGS)
set(ARROW_GFLAGS_REQUIRED_VERSION "2.1.0")
resolve_dependency(gflags
@ -134,7 +135,7 @@ index 673a58eed..8c2c1e2fb 100644
REQUIRED_VERSION
${ARROW_GFLAGS_REQUIRED_VERSION}
IS_RUNTIME_DEPENDENCY
@@ -1355,9 +1350,10 @@ endmacro()
@@ -1402,9 +1397,10 @@ endmacro()
if(ARROW_WITH_THRIFT)
# We already may have looked for Thrift earlier, when considering whether
# to build Boost, so don't look again if already found.
@ -146,7 +147,7 @@ index 673a58eed..8c2c1e2fb 100644
REQUIRED_VERSION
0.11.0
PC_PACKAGE_NAMES
@@ -1366,6 +1362,14 @@ if(ARROW_WITH_THRIFT)
@@ -1413,6 +1409,14 @@ if(ARROW_WITH_THRIFT)
# TODO: Don't use global includes but rather target_include_directories
include_directories(SYSTEM ${THRIFT_INCLUDE_DIR})
@ -161,7 +162,7 @@ index 673a58eed..8c2c1e2fb 100644
string(REPLACE "." ";" VERSION_LIST ${THRIFT_VERSION})
list(GET VERSION_LIST 0 THRIFT_VERSION_MAJOR)
list(GET VERSION_LIST 1 THRIFT_VERSION_MINOR)
@@ -1480,6 +1484,7 @@ if(ARROW_WITH_PROTOBUF)
@@ -1528,6 +1532,7 @@ if(ARROW_WITH_PROTOBUF)
set(ARROW_PROTOBUF_REQUIRED_VERSION "2.6.1")
endif()
resolve_dependency(Protobuf
@ -169,7 +170,7 @@ index 673a58eed..8c2c1e2fb 100644
REQUIRED_VERSION
${ARROW_PROTOBUF_REQUIRED_VERSION}
PC_PACKAGE_NAMES
@@ -1490,6 +1495,10 @@ if(ARROW_WITH_PROTOBUF)
@@ -1538,6 +1543,10 @@ if(ARROW_WITH_PROTOBUF)
endif()
# TODO: Don't use global includes but rather target_include_directories
@ -180,7 +181,7 @@ index 673a58eed..8c2c1e2fb 100644
include_directories(SYSTEM ${PROTOBUF_INCLUDE_DIR})
if(TARGET arrow::protobuf::libprotobuf)
@@ -1538,12 +1547,18 @@ if(ARROW_WITH_PROTOBUF)
@@ -1586,12 +1595,18 @@ if(ARROW_WITH_PROTOBUF)
# Log protobuf paths as we often see issues with mixed sources for
# the libraries and protoc.
@ -199,7 +200,7 @@ index 673a58eed..8c2c1e2fb 100644
message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}")
message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}")
endif()
@@ -1954,7 +1969,7 @@ endmacro()
@@ -2001,7 +2016,7 @@ endmacro()
if(ARROW_WITH_RAPIDJSON)
set(ARROW_RAPIDJSON_REQUIRED_VERSION "1.1.0")
resolve_dependency(RapidJSON
@ -208,7 +209,7 @@ index 673a58eed..8c2c1e2fb 100644
TRUE
REQUIRED_VERSION
${ARROW_RAPIDJSON_REQUIRED_VERSION}
@@ -2093,10 +2108,11 @@ macro(build_lz4)
@@ -2140,10 +2155,11 @@ macro(build_lz4)
endmacro()
if(ARROW_WITH_LZ4)
@ -222,7 +223,7 @@ index 673a58eed..8c2c1e2fb 100644
include_directories(SYSTEM ${LZ4_INCLUDE_DIR})
endif()
@@ -2160,7 +2176,7 @@ endmacro()
@@ -2207,7 +2223,7 @@ endmacro()
if(ARROW_WITH_ZSTD)
# ARROW-13384: ZSTD_minCLevel was added in v1.4.0, required by ARROW-13091
resolve_dependency(zstd
@ -231,7 +232,7 @@ index 673a58eed..8c2c1e2fb 100644
libzstd
REQUIRED_VERSION
1.4.0)
@@ -2343,9 +2359,8 @@ macro(build_utf8proc)
@@ -2390,9 +2406,8 @@ macro(build_utf8proc)
endmacro()
if(ARROW_WITH_UTF8PROC)
@ -243,7 +244,7 @@ index 673a58eed..8c2c1e2fb 100644
PC_PACKAGE_NAMES
libutf8proc)
@@ -2353,7 +2368,7 @@ if(ARROW_WITH_UTF8PROC)
@@ -2400,7 +2415,7 @@ if(ARROW_WITH_UTF8PROC)
# TODO: Don't use global definitions but rather
# target_compile_definitions or target_link_libraries
@ -252,7 +253,7 @@ index 673a58eed..8c2c1e2fb 100644
INTERFACE_COMPILER_DEFINITIONS)
if(UTF8PROC_COMPILER_DEFINITIONS)
add_definitions(-D${UTF8PROC_COMPILER_DEFINITIONS})
@@ -2361,7 +2376,7 @@ if(ARROW_WITH_UTF8PROC)
@@ -2408,7 +2423,7 @@ if(ARROW_WITH_UTF8PROC)
# TODO: Don't use global includes but rather
# target_include_directories or target_link_libraries
@ -261,7 +262,7 @@ index 673a58eed..8c2c1e2fb 100644
INTERFACE_INCLUDE_DIRECTORIES)
include_directories(SYSTEM ${UTF8PROC_INCLUDE_DIR})
endif()
@@ -3270,7 +3285,7 @@ endmacro()
@@ -3317,7 +3332,7 @@ endmacro()
macro(build_grpc)
resolve_dependency(c-ares
@ -270,16 +271,16 @@ index 673a58eed..8c2c1e2fb 100644
TRUE
PC_PACKAGE_NAMES
libcares)
@@ -3493,7 +3508,7 @@ endmacro()
if(ARROW_WITH_GRPC)
set(ARROW_GRPC_REQUIRED_VERSION "1.17.0")
@@ -3555,7 +3570,7 @@ if(ARROW_WITH_GRPC)
set(gRPC_SOURCE "${Protobuf_SOURCE}")
endif()
resolve_dependency(gRPC
- HAVE_ALT
+ USE_CONFIG
TRUE
REQUIRED_VERSION
${ARROW_GRPC_REQUIRED_VERSION}
@@ -3503,6 +3518,10 @@ if(ARROW_WITH_GRPC)
@@ -3565,6 +3580,10 @@ if(ARROW_WITH_GRPC)
# TODO: Don't use global includes but rather target_include_directories
get_target_property(GRPC_INCLUDE_DIR gRPC::grpc++ INTERFACE_INCLUDE_DIRECTORIES)
include_directories(SYSTEM ${GRPC_INCLUDE_DIR})
@ -290,7 +291,7 @@ index 673a58eed..8c2c1e2fb 100644
if(GRPC_VENDORED)
set(GRPCPP_PP_INCLUDE TRUE)
@@ -4019,7 +4038,8 @@ if(ARROW_S3)
@@ -4315,7 +4334,8 @@ if(ARROW_S3)
s3
transfer
identity-management
@ -301,10 +302,10 @@ index 673a58eed..8c2c1e2fb 100644
# Restore previous value of BUILD_SHARED_LIBS
diff --git a/cpp/src/arrow/adapters/orc/CMakeLists.txt b/cpp/src/arrow/adapters/orc/CMakeLists.txt
index ca901b07d..4512a175f 100644
index b1b6847cf..444a45e4e 100644
--- a/cpp/src/arrow/adapters/orc/CMakeLists.txt
+++ b/cpp/src/arrow/adapters/orc/CMakeLists.txt
@@ -29,7 +29,7 @@ set(ORC_MIN_TEST_LIBS
@@ -30,7 +30,7 @@ set(ORC_MIN_TEST_LIBS
GTest::gtest_main
GTest::gtest
Snappy::snappy

4
ports/arrow/portfile.cmake
View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/arrow
REF apache-arrow-6.0.1
SHA512 211c3238f76dde06383e817aad0cd4bbb4ab710a1c6a822a639e1588864bd574efb199e101469c91e933d6f21d65e79c99d382a9d326b12313779c08ea3163c8
REF apache-arrow-7.0.0
SHA512 4df480e03dcd85c1c04f93ca55968cf64eb96b4bdb586d9ad3bd1d5ba6d9ec7cca34fefef43d84b921ba74ceaeb48f8ac9d1d1355f2408ebffd2b2a00a3da2bd
HEAD_REF master
PATCHES
all.patch

4
ports/arrow/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "arrow",
"version": "6.0.1",
"port-version": 1,
"version": "7.0.0",
"description": "Cross-language development platform for in-memory analytics",
"homepage": "https://arrow.apache.org",
"license": "Apache-2.0",
"supports": "x64 | (arm64 & !windows)",
"dependencies": [
"boost-filesystem",

5
versions/a-/arrow.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3682e12e1b3f3aa79551877b157ff3d914cb5c90",
"version": "7.0.0",
"port-version": 0
},
{
"git-tree": "b12626f29cb0ba8a049241153af0dfeca9a810d7",
"version": "6.0.1",

4
versions/baseline.json
View File

@ -169,8 +169,8 @@
"port-version": 0
},
"arrow": {
"baseline": "6.0.1",
"port-version": 1
"baseline": "7.0.0",
"port-version": 0
},
"ashes": {
"baseline": "2021-06-18",