mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 04:49:04 +08:00
[arrow] Update version 17.0.0 (#40164)
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
parent
f69f3a33c3
commit
5bc4fc8e73
@ -1,12 +0,0 @@
|
|||||||
diff --git a/cpp/src/arrow/json/object_writer.h b/cpp/src/arrow/json/object_writer.h
|
|
||||||
index b15b09d..cf1ce62 100644
|
|
||||||
--- a/cpp/src/arrow/json/object_writer.h
|
|
||||||
+++ b/cpp/src/arrow/json/object_writer.h
|
|
||||||
@@ -18,6 +18,7 @@
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
+#include <string>
|
|
||||||
#include <string_view>
|
|
||||||
|
|
||||||
#include "arrow/util/visibility.h"
|
|
@ -1,9 +1,9 @@
|
|||||||
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
|
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
|
||||||
index 026bb5c..5c1b5e3 100644
|
index 6dc8358..2b91efa 100644
|
||||||
--- a/cpp/src/arrow/CMakeLists.txt
|
--- a/cpp/src/arrow/CMakeLists.txt
|
||||||
+++ b/cpp/src/arrow/CMakeLists.txt
|
+++ b/cpp/src/arrow/CMakeLists.txt
|
||||||
@@ -166,7 +166,7 @@ if(WIN32)
|
@@ -166,7 +166,7 @@ if(WIN32)
|
||||||
list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll")
|
list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
-if(NOT WIN32 AND NOT APPLE)
|
-if(NOT WIN32 AND NOT APPLE)
|
||||||
|
@ -2,7 +2,7 @@ vcpkg_download_distfile(
|
|||||||
ARCHIVE_PATH
|
ARCHIVE_PATH
|
||||||
URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz"
|
URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz"
|
||||||
FILENAME apache-arrow-${VERSION}.tar.gz
|
FILENAME apache-arrow-${VERSION}.tar.gz
|
||||||
SHA512 28975f59e1fdde2dba4afaf4a5ba934b63db3a7f27656e2aa0af0f0d2a046c9dbfa9a6082de94629c36d03809b296566a37ea65ec5a2fc17fedac7d21e272d31
|
SHA512 4e2a617b8deeb9f94ee085653a721904a75696f0827bcba82b535cc7f4f723066a09914c7fa83c593e51a8a4031e8bf99e563cac1ebb1d89604cb406975d4864
|
||||||
)
|
)
|
||||||
vcpkg_extract_source_archive(
|
vcpkg_extract_source_archive(
|
||||||
SOURCE_PATH
|
SOURCE_PATH
|
||||||
@ -12,8 +12,6 @@ vcpkg_extract_source_archive(
|
|||||||
msvc-static-name.patch
|
msvc-static-name.patch
|
||||||
utf8proc.patch
|
utf8proc.patch
|
||||||
thrift.patch
|
thrift.patch
|
||||||
remove-dll-suffix.patch #Upstream PR: https://github.com/apache/arrow/pull/41341
|
|
||||||
add-include-string.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||||
|
@ -1,39 +0,0 @@
|
|||||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
|
||||||
index 941f5db..473e380 100644
|
|
||||||
--- a/cpp/CMakeLists.txt
|
|
||||||
+++ b/cpp/CMakeLists.txt
|
|
||||||
@@ -711,7 +711,7 @@ list(APPEND ARROW_TEST_LINK_LIBS ${ARROW_GTEST_GMOCK} ${ARROW_GTEST_GTEST_MAIN})
|
|
||||||
if(ARROW_BUILD_BENCHMARKS)
|
|
||||||
set(ARROW_BENCHMARK_LINK_LIBS benchmark::benchmark_main ${ARROW_TEST_LINK_LIBS})
|
|
||||||
if(WIN32)
|
|
||||||
- list(APPEND ARROW_BENCHMARK_LINK_LIBS Shlwapi.dll)
|
|
||||||
+ list(APPEND ARROW_BENCHMARK_LINK_LIBS Shlwapi)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
|
|
||||||
index 5c1b5e3..f16ee55 100644
|
|
||||||
--- a/cpp/src/arrow/CMakeLists.txt
|
|
||||||
+++ b/cpp/src/arrow/CMakeLists.txt
|
|
||||||
@@ -163,7 +163,7 @@ if(CMAKE_THREAD_LIBS_INIT)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WIN32)
|
|
||||||
- list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll")
|
|
||||||
+ list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT WIN32 AND NOT APPLE AND NOT ANDROID)
|
|
||||||
@@ -628,9 +628,9 @@ else()
|
|
||||||
list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS ArrowTesting::gtest)
|
|
||||||
endif()
|
|
||||||
if(WIN32)
|
|
||||||
- list(APPEND ARROW_TESTING_SHARED_LINK_LIBS "ws2_32.dll")
|
|
||||||
- list(APPEND ARROW_TESTING_STATIC_LINK_LIBS "ws2_32.dll")
|
|
||||||
- list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS "ws2_32.dll")
|
|
||||||
+ list(APPEND ARROW_TESTING_SHARED_LINK_LIBS "ws2_32")
|
|
||||||
+ list(APPEND ARROW_TESTING_STATIC_LINK_LIBS "ws2_32")
|
|
||||||
+ list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS "ws2_32")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(ARROW_TESTING_SRCS
|
|
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "arrow",
|
"name": "arrow",
|
||||||
"version": "16.1.0",
|
"version": "17.0.0",
|
||||||
"port-version": 1,
|
|
||||||
"description": "Cross-language development platform for in-memory analytics",
|
"description": "Cross-language development platform for in-memory analytics",
|
||||||
"homepage": "https://arrow.apache.org",
|
"homepage": "https://arrow.apache.org",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "f06fe60d953b9696bc4f557c42c3e3adda042a39",
|
||||||
|
"version": "17.0.0",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "b0fb85e8be36a721896cb65227bcc3c85a4f88ee",
|
"git-tree": "b0fb85e8be36a721896cb65227bcc3c85a4f88ee",
|
||||||
"version": "16.1.0",
|
"version": "16.1.0",
|
||||||
|
@ -241,8 +241,8 @@
|
|||||||
"port-version": 6
|
"port-version": 6
|
||||||
},
|
},
|
||||||
"arrow": {
|
"arrow": {
|
||||||
"baseline": "16.1.0",
|
"baseline": "17.0.0",
|
||||||
"port-version": 1
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"arsenalgear": {
|
"arsenalgear": {
|
||||||
"baseline": "2.1.0",
|
"baseline": "2.1.0",
|
||||||
|
Loading…
Reference in New Issue
Block a user