3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-29 03:34:26 +08:00
Code Issues Projects Releases Wiki Activity

[arrow] fix build with clang-cl (#26182)

Browse Source 
* arrow: fix build with clang-cl and some minor fixes

* v db
This commit is contained in:
Alexander Neumann 2022-08-06 08:48:36 +02:00 committed by GitHub
parent 73cdecc07a
commit b74f8f68b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/arrow/portfile.cmake
View File

@ -38,15 +38,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
cuda ARROW_CUDA cuda ARROW_CUDA
) )
if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF) list(APPEND FEATURE_OPTIONS "-DARROW_USE_NATIVE_INT128=OFF")
elseif("jemalloc" IN_LIST FEATURES) endif()
if("jemalloc" IN_LIST FEATURES)
set(MALLOC_OPTIONS -DARROW_JEMALLOC=ON) set(MALLOC_OPTIONS -DARROW_JEMALLOC=ON)
else() else()
set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF) set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF)
endif() endif()
if(VCPKG_TARGET_IS_WINDOWS AND ("mimalloc" IN_LIST FEATURES)) if("mimalloc" IN_LIST FEATURES)
set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=ON) set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=ON)
else() else()
set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=OFF) set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=OFF)

7
ports/arrow/vcpkg.json
View File

@ -1,6 +1,7 @@
{ {
"name": "arrow", "name": "arrow",
"version": "8.0.1", "version": "8.0.1",
"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",
@ -64,7 +65,8 @@
] ]
}, },
"jemalloc": { "jemalloc": {
"description": "jemalloc allocator" "description": "jemalloc allocator",
"supports": "!windows"
}, },
"json": { "json": {
"description": "JSON support", "description": "JSON support",
@ -73,7 +75,8 @@
] ]
}, },
"mimalloc": { "mimalloc": {
"description": "mimalloc allocator" "description": "mimalloc allocator",
"supports": "windows"
}, },
"orc": { "orc": {
"description": "ORC support", "description": "ORC support",

5
versions/a-/arrow.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "d53797d201548a07be19eaf7d12d87198c458636",
"version": "8.0.1",
"port-version": 1
},
{ {
"git-tree": "6935bb6b1a309931f2f85bd8da334b9777d51a4a", "git-tree": "6935bb6b1a309931f2f85bd8da334b9777d51a4a",
"version": "8.0.1", "version": "8.0.1",

2
versions/baseline.json
View File

@ -178,7 +178,7 @@
}, },
"arrow": { "arrow": {
"baseline": "8.0.1", "baseline": "8.0.1",
"port-version": 0 "port-version": 1
}, },
"ashes": { "ashes": {
"baseline": "2022-06-08", "baseline": "2022-06-08",