mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[vcpkg baseline][vcpkg-ci-arrow | arrow] Fix ci error (#31439)
* [vcpkg-ci-arrow] Fix ci error * update ci baseline * fix arrow ci error * update version * update patch * update version * update patch * update version
This commit is contained in:
parent
0fbc24d396
commit
892fd52dc4
13
ports/arrow/fix-ci-error.patch
Normal file
13
ports/arrow/fix-ci-error.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
index eeda520..f55080e 100644
|
||||
--- a/cpp/CMakeLists.txt
|
||||
+++ b/cpp/CMakeLists.txt
|
||||
@@ -921,7 +921,7 @@ if(WIN32)
|
||||
list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll")
|
||||
endif()
|
||||
|
||||
-if(NOT WIN32 AND NOT APPLE)
|
||||
+if(NOT WIN32 AND NOT APPLE AND NOT ANDROID)
|
||||
# Pass -lrt on Linux only
|
||||
list(APPEND ARROW_SYSTEM_LINK_LIBS rt)
|
||||
endif()
|
@ -11,6 +11,7 @@ vcpkg_extract_source_archive(
|
||||
msvc-static-name.patch
|
||||
utf8proc.patch
|
||||
thrift.patch
|
||||
fix-ci-error.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "arrow",
|
||||
"version": "12.0.0",
|
||||
"port-version": 1,
|
||||
"description": "Cross-language development platform for in-memory analytics",
|
||||
"homepage": "https://arrow.apache.org",
|
||||
"license": "Apache-2.0",
|
||||
|
@ -58,8 +58,6 @@ arrayfire:x64-linux=fail
|
||||
allegro5:arm64-windows=fail
|
||||
# Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h
|
||||
apr:arm64-windows=fail
|
||||
arrow:arm64-android=fail
|
||||
arrow:x64-android=fail
|
||||
assimp:arm-neon-android=fail
|
||||
avro-c:arm-neon-android=fail
|
||||
avro-c:arm64-android=fail
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "4e29a49e78533ec10e3142ae7ad69fdd12c8d163",
|
||||
"version": "12.0.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "881bfaaab349dae46929b36e5b84e7036a009ad3",
|
||||
"version": "12.0.0",
|
||||
|
@ -218,7 +218,7 @@
|
||||
},
|
||||
"arrow": {
|
||||
"baseline": "12.0.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"arsenalgear": {
|
||||
"baseline": "2.1.0",
|
||||
|
Loading…
x
Reference in New Issue
Block a user