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

* arrow: fix build with clang-cl and some minor fixes * v db
microsoft · Aug 6, 2022 · b74f8f6 · b74f8f6
1 parent 73cdecc
commit b74f8f6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
@@ -38,15 +38,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         cuda        ARROW_CUDA
 )
 
-if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
-    set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF)
-elseif("jemalloc" IN_LIST FEATURES)
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    list(APPEND FEATURE_OPTIONS "-DARROW_USE_NATIVE_INT128=OFF")
+endif()
+
+if("jemalloc" IN_LIST FEATURES)
     set(MALLOC_OPTIONS -DARROW_JEMALLOC=ON)
 else()
     set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF)
 endif()
 
-if(VCPKG_TARGET_IS_WINDOWS AND ("mimalloc" IN_LIST FEATURES))
+if("mimalloc" IN_LIST FEATURES)
     set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=ON)
 else()
     set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=OFF)

diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "arrow",
   "version": "8.0.1",
+  "port-version": 1,
   "description": "Cross-language development platform for in-memory analytics",
   "homepage": "https://arrow.apache.org",
   "license": "Apache-2.0",
@@ -64,7 +65,8 @@
       ]
     },
     "jemalloc": {
-      "description": "jemalloc allocator"
+      "description": "jemalloc allocator",
+      "supports": "!windows"
     },
     "json": {
       "description": "JSON support",
@@ -73,7 +75,8 @@
       ]
     },
     "mimalloc": {
-      "description": "mimalloc allocator"
+      "description": "mimalloc allocator",
+      "supports": "windows"
     },
     "orc": {
       "description": "ORC support",

diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d53797d201548a07be19eaf7d12d87198c458636",
+      "version": "8.0.1",
+      "port-version": 1
+    },
     {
       "git-tree": "6935bb6b1a309931f2f85bd8da334b9777d51a4a",
       "version": "8.0.1",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -178,7 +178,7 @@
     },
     "arrow": {
       "baseline": "8.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "ashes": {
       "baseline": "2022-06-08",