Use xsimd 8.1.0 in vcpkg

apache · Jun 3, 2022 · d100b39 · d100b39
1 parent 309e42a
commit d100b39
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/.env b/.env
@@ -93,12 +93,7 @@ DEVTOOLSET_VERSION=-1
 # Please also update the crossbow configuration in order to keep the github
 # actions cache up to date for the macOS wheels:
 #   https://github.com/ursacomputing/crossbow/blob/master/.github/workflows/cache_vcpkg.yml
-#
-# After commit 89295c9 openssl is only available as 3.0.2 which is
-# incompatible with aws-sdk-cpp 1.8.3 see
-# https://github.com/aws/aws-sdk-cpp/issues/1582 and causes issues on
-# manylinux2010
-VCPKG="89295c9"
+VCPKG="38bb87c"
 
 # Use conanio/${CONAN} for "docker-compose run --rm conan". See
 # https://github.com/conan-io/conan-docker-tools#readme for available

diff --git a/ci/vcpkg/vcpkg.json b/ci/vcpkg/vcpkg.json
@@ -25,6 +25,7 @@
     "re2",
     "snappy",
     "utf8proc",
+    "xsimd",
     "zlib",
     "zstd",
     {

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -4350,6 +4350,9 @@ macro(build_awssdk)
   set(AWSSDK_COMMON_CMAKE_ARGS
       ${EP_COMMON_CMAKE_ARGS}
       -DBUILD_SHARED_LIBS=OFF
+      # Workaround for https://github.com/aws/aws-sdk-cpp/issues/1582
+      -DCMAKE_CXX_FLAGS="${EP_CXX_FLAGS} -Wno-error=deprecated-declarations"
+      -DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}="${EP_CXX_FLAGS} -Wno-error=deprecated-declarations"
       -DCMAKE_BUILD_TYPE=${AWSSDK_BUILD_TYPE}
       -DCMAKE_INSTALL_LIBDIR=${AWSSDK_LIB_DIR}
       -DENABLE_TESTING=OFF
@@ -4443,20 +4446,11 @@ macro(build_awssdk)
                       DEPENDS aws_checksums_ep)
   add_dependencies(AWS::aws-c-event-stream aws_c_event_stream_ep)
 
-  set(AWSSDK_PATCH_COMMAND)
-  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER
-                                              "10")
-    # Workaround for https://github.com/aws/aws-sdk-cpp/issues/1750
-    set(AWSSDK_PATCH_COMMAND "sed" "-i.bak" "-e" "s/\"-Werror\"//g"
-                             "<SOURCE_DIR>/cmake/compiler_settings.cmake")
-  endif()
-
   externalproject_add(awssdk_ep
                       ${EP_LOG_OPTIONS}
                       URL ${AWSSDK_SOURCE_URL}
                       URL_HASH "SHA256=${ARROW_AWSSDK_BUILD_SHA256_CHECKSUM}"
                       CMAKE_ARGS ${AWSSDK_CMAKE_ARGS}
-                      PATCH_COMMAND ${AWSSDK_PATCH_COMMAND}
                       BUILD_BYPRODUCTS ${AWS_CPP_SDK_COGNITO_IDENTITY_STATIC_LIBRARY}
                                        ${AWS_CPP_SDK_CORE_STATIC_LIBRARY}
                                        ${AWS_CPP_SDK_IDENTITY_MANAGEMENT_STATIC_LIBRARY}

diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json
@@ -47,6 +47,7 @@
     "sqlite3",
     "thrift",
     "utf8proc",
+    "xsimd",
     "zlib",
     "zstd"
   ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ @@
         "re2",
         "snappy",
         "utf8proc",
+        "xsimd",
         "zlib",
         "zstd",
         {
@@ Expand Down @@