From 6c2274d8e7ae976deb84dea82d6f69cc249d1a2d Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Wed, 6 Oct 2021 17:26:52 +0300 Subject: [PATCH 01/16] update versions.txt --- cpp/thirdparty/versions.txt | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 4223286fb2d..010857f9335 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -33,26 +33,26 @@ ARROW_AWS_C_COMMON_BUILD_VERSION=v0.6.9 ARROW_AWS_C_COMMON_BUILD_SHA256_CHECKSUM=928a3e36f24d1ee46f9eec360ec5cebfe8b9b8994fe39d4fa74ff51aebb12717 ARROW_AWS_C_EVENT_STREAM_BUILD_VERSION=v0.1.5 ARROW_AWS_C_EVENT_STREAM_BUILD_SHA256_CHECKSUM=f1b423a487b5d6dca118bfc0d0c6cc596dc476b282258a3228e73a8f730422d4 -ARROW_BOOST_BUILD_VERSION=1.75.0 -ARROW_BOOST_BUILD_SHA256_CHECKSUM=cb97b36e2295a321c34851e0455bc2630ad6c691d4f9f589170066cd11c835b4 +ARROW_BOOST_BUILD_VERSION=1.77.0 +ARROW_BOOST_BUILD_SHA256_CHECKSUM=5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131 ARROW_BROTLI_BUILD_VERSION=v1.0.9 ARROW_BROTLI_BUILD_SHA256_CHECKSUM=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46 ARROW_BZIP2_BUILD_VERSION=1.0.8 ARROW_BZIP2_BUILD_SHA256_CHECKSUM=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 -ARROW_CARES_BUILD_VERSION=1.17.1 -ARROW_CARES_BUILD_SHA256_CHECKSUM=d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40 +ARROW_CARES_BUILD_VERSION=1.17.2 +ARROW_CARES_BUILD_SHA256_CHECKSUM=4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d ARROW_CRC32C_BUILD_VERSION=1.1.2 ARROW_CRC32C_BUILD_SHA256_CHECKSUM=ac07840513072b7fcebda6e821068aa04889018f24e10e46181068fb214d7e56 -ARROW_GBENCHMARK_BUILD_VERSION=v1.5.2 -ARROW_GBENCHMARK_BUILD_SHA256_CHECKSUM=dccbdab796baa1043f04982147e67bb6e118fe610da2c65f88912d73987e700c +ARROW_GBENCHMARK_BUILD_VERSION=v1.5.6 +ARROW_GBENCHMARK_BUILD_SHA256_CHECKSUM=789f85b4810d13ff803834ea75999e41b326405d83d6a538baf01499eda96102 ARROW_GFLAGS_BUILD_VERSION=v2.2.2 ARROW_GFLAGS_BUILD_SHA256_CHECKSUM=34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf -ARROW_GLOG_BUILD_VERSION=v0.4.0 -ARROW_GLOG_BUILD_SHA256_CHECKSUM=f28359aeba12f30d73d9e4711ef356dc842886968112162bc73002645139c39c -ARROW_GOOGLE_CLOUD_CPP_BUILD_VERSION=v1.31.1 -ARROW_GOOGLE_CLOUD_CPP_BUILD_SHA256_CHECKSUM=dc7cbf95b506a84b48cf71e0462985d262183edeaabdacaaee2109852394a609 -ARROW_GRPC_BUILD_VERSION=v1.35.0 -ARROW_GRPC_BUILD_SHA256_CHECKSUM=27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958 +ARROW_GLOG_BUILD_VERSION=v0.5.0 +ARROW_GLOG_BUILD_SHA256_CHECKSUM=eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5 +ARROW_GOOGLE_CLOUD_CPP_BUILD_VERSION=v1.32.0 +ARROW_GOOGLE_CLOUD_CPP_BUILD_SHA256_CHECKSUM=c62338389f76915179fe61d8c0f5fefa06131b4e0d7312707af5309b1394e099 +ARROW_GRPC_BUILD_VERSION=v1.41.0 +ARROW_GRPC_BUILD_SHA256_CHECKSUM=e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656 ARROW_GTEST_BUILD_VERSION=1.11.0 ARROW_GTEST_BUILD_SHA256_CHECKSUM=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5 ARROW_JEMALLOC_BUILD_VERSION=5.2.1 @@ -67,19 +67,19 @@ ARROW_NLOHMANN_JSON_BUILD_VERSION=v3.10.2 ARROW_NLOHMANN_JSON_BUILD_SHA256_CHECKSUM=081ed0f9f89805c2d96335c3acfa993b39a0a5b4b4cef7edb68dd2210a13458c ARROW_ORC_BUILD_VERSION=1.7.0 ARROW_ORC_BUILD_SHA256_CHECKSUM=45d6ba9149ffa2aaa168d61ab326f61181861c94529f26da3918a9aa2f801e39 -ARROW_PROTOBUF_BUILD_VERSION=v3.17.3 -ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2 +ARROW_PROTOBUF_BUILD_VERSION=v3.18.1 +ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=9111bf0b542b631165fadbd80aa60e7fb25b25311c532139ed2089d76ddf6dd7 # Because of https://github.com/Tencent/rapidjson/pull/1323, we require # a pre-release version of RapidJSON to build with GCC 8 without # warnings. ARROW_RAPIDJSON_BUILD_VERSION=1a803826f1197b5e30703afe4b9c0e7dd48074f5 ARROW_RAPIDJSON_BUILD_SHA256_CHECKSUM=0b6b780b6c534bfb0b23d29910bfe361e486bcfeaf106db8bc8995792072905a -ARROW_RE2_BUILD_VERSION=2021-02-02 -ARROW_RE2_BUILD_SHA256_CHECKSUM=1396ab50c06c1a8885fb68bf49a5ecfd989163015fd96699a180d6414937f33f -ARROW_SNAPPY_BUILD_VERSION=1.1.8 -ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f -ARROW_THRIFT_BUILD_VERSION=0.13.0 -ARROW_THRIFT_BUILD_SHA256_CHECKSUM=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179 +ARROW_RE2_BUILD_VERSION=2021-09-01 +ARROW_RE2_BUILD_SHA256_CHECKSUM=42a2e1d56b5de252f5d418dc1cc0848e9e52ca22b056453988b18c6195ec7f8d +ARROW_SNAPPY_BUILD_VERSION=1.1.9 +ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 +ARROW_THRIFT_BUILD_VERSION=0.15.0 +ARROW_THRIFT_BUILD_SHA256_CHECKSUM=d5883566d161f8f6ddd4e21f3a9e3e6b8272799d054820f1c25b11e86718f86b ARROW_UTF8PROC_BUILD_VERSION=v2.6.1 ARROW_UTF8PROC_BUILD_SHA256_CHECKSUM=4c06a9dc4017e8a2438ef80ee371d45868bda2237a98b26554de7a95406b283b ARROW_XSIMD_BUILD_VERSION=e9234cd6e6f4428fc260073b2c34ffe86fda1f34 From 23eeb5ed07072835ea8659cd9e3c943d410eede9 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Wed, 6 Oct 2021 20:21:58 +0300 Subject: [PATCH 02/16] update versions for download --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 ++++ cpp/thirdparty/versions.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 249b7161f78..257bd6006dd 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -833,6 +833,10 @@ if(MSVC AND ARROW_USE_STATIC_CRT) set(Boost_USE_STATIC_RUNTIME ON) endif() set(Boost_ADDITIONAL_VERSIONS + "1.77.0" + "1.77" + "1.76.0" + "1.76" "1.75.0" "1.75" "1.74.0" diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 010857f9335..6c4b06caf89 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -27,8 +27,8 @@ ARROW_ABSL_BUILD_VERSION=20210324.2 ARROW_ABSL_BUILD_SHA256_CHECKSUM=59b862f50e710277f8ede96f083a5bb8d7c9595376146838b9580be90374ee1f ARROW_AWSSDK_BUILD_VERSION=1.8.133 ARROW_AWSSDK_BUILD_SHA256_CHECKSUM=d6c495bc06be5e21dac716571305d77437e7cfd62a2226b8fe48d9ab5785a8d6 -ARROW_AWS_CHECKSUMS_BUILD_VERSION=v0.1.10 -ARROW_AWS_CHECKSUMS_BUILD_SHA256_CHECKSUM=c9d0100a5743765fc8034e34e2310f77f59b1adab6f2e2f2d4d2a3bd81b2a36d +ARROW_AWS_CHECKSUMS_BUILD_VERSION=v0.1.12 +ARROW_AWS_CHECKSUMS_BUILD_SHA256_CHECKSUM=394723034b81cc7cd528401775bc7aca2b12c7471c92350c80a0e2fb9d2909fe ARROW_AWS_C_COMMON_BUILD_VERSION=v0.6.9 ARROW_AWS_C_COMMON_BUILD_SHA256_CHECKSUM=928a3e36f24d1ee46f9eec360ec5cebfe8b9b8994fe39d4fa74ff51aebb12717 ARROW_AWS_C_EVENT_STREAM_BUILD_VERSION=v0.1.5 From e77786b72922dc145df0b188325e761de1773bd7 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Wed, 13 Oct 2021 17:15:20 +0300 Subject: [PATCH 03/16] fix protobuf sha256sum --- cpp/thirdparty/versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index f0445cf9b32..2475b2e0463 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -68,7 +68,7 @@ ARROW_NLOHMANN_JSON_BUILD_SHA256_CHECKSUM=081ed0f9f89805c2d96335c3acfa993b39a0a5 ARROW_ORC_BUILD_VERSION=1.7.0 ARROW_ORC_BUILD_SHA256_CHECKSUM=45d6ba9149ffa2aaa168d61ab326f61181861c94529f26da3918a9aa2f801e39 ARROW_PROTOBUF_BUILD_VERSION=v3.18.1 -ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=9111bf0b542b631165fadbd80aa60e7fb25b25311c532139ed2089d76ddf6dd7 +ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=b8ab9bbdf0c6968cf20060794bc61e231fae82aaf69d6e3577c154181991f576 # Because of https://github.com/Tencent/rapidjson/pull/1323, we require # a pre-release version of RapidJSON to build with GCC 8 without # warnings. From 6ffd5e1c430210c77941291a7611ae38984cde76 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Sun, 17 Oct 2021 14:40:41 +0300 Subject: [PATCH 04/16] use thrift 0.13 --- cpp/thirdparty/versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 2475b2e0463..366000c3ddf 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -25,8 +25,8 @@ ARROW_ABSL_BUILD_VERSION=20210324.2 ARROW_ABSL_BUILD_SHA256_CHECKSUM=59b862f50e710277f8ede96f083a5bb8d7c9595376146838b9580be90374ee1f -ARROW_AWSSDK_BUILD_VERSION=1.8.133 -ARROW_AWSSDK_BUILD_SHA256_CHECKSUM=d6c495bc06be5e21dac716571305d77437e7cfd62a2226b8fe48d9ab5785a8d6 +ARROW_AWSSDK_BUILD_VERSION=1.9.123 +ARROW_AWSSDK_BUILD_SHA256_CHECKSUM=b0ad04a8f27505fbedf5e40da029c9c51b5efe2453674f351234583456919328 ARROW_AWS_CHECKSUMS_BUILD_VERSION=v0.1.12 ARROW_AWS_CHECKSUMS_BUILD_SHA256_CHECKSUM=394723034b81cc7cd528401775bc7aca2b12c7471c92350c80a0e2fb9d2909fe ARROW_AWS_C_COMMON_BUILD_VERSION=v0.6.9 @@ -78,8 +78,8 @@ ARROW_RE2_BUILD_VERSION=2021-09-01 ARROW_RE2_BUILD_SHA256_CHECKSUM=42a2e1d56b5de252f5d418dc1cc0848e9e52ca22b056453988b18c6195ec7f8d ARROW_SNAPPY_BUILD_VERSION=1.1.9 ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 -ARROW_THRIFT_BUILD_VERSION=0.15.0 -ARROW_THRIFT_BUILD_SHA256_CHECKSUM=d5883566d161f8f6ddd4e21f3a9e3e6b8272799d054820f1c25b11e86718f86b +ARROW_THRIFT_BUILD_VERSION=0.13.0 +ARROW_THRIFT_BUILD_SHA256_CHECKSUM=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179 ARROW_UTF8PROC_BUILD_VERSION=v2.6.1 ARROW_UTF8PROC_BUILD_SHA256_CHECKSUM=4c06a9dc4017e8a2438ef80ee371d45868bda2237a98b26554de7a95406b283b ARROW_XSIMD_BUILD_VERSION=f212f3c3801924bf218bc39705230a747467edcb From f68f9ed4bbfadfef0c229ae7bc9da3dd88c0dc3a Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Sun, 17 Oct 2021 16:20:21 +0300 Subject: [PATCH 05/16] Revert AWS SDK --- cpp/thirdparty/versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 366000c3ddf..1d871918989 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -25,8 +25,8 @@ ARROW_ABSL_BUILD_VERSION=20210324.2 ARROW_ABSL_BUILD_SHA256_CHECKSUM=59b862f50e710277f8ede96f083a5bb8d7c9595376146838b9580be90374ee1f -ARROW_AWSSDK_BUILD_VERSION=1.9.123 -ARROW_AWSSDK_BUILD_SHA256_CHECKSUM=b0ad04a8f27505fbedf5e40da029c9c51b5efe2453674f351234583456919328 +ARROW_AWSSDK_BUILD_VERSION=1.8.133 +ARROW_AWSSDK_BUILD_SHA256_CHECKSUM=d6c495bc06be5e21dac716571305d77437e7cfd62a2226b8fe48d9ab5785a8d6 ARROW_AWS_CHECKSUMS_BUILD_VERSION=v0.1.12 ARROW_AWS_CHECKSUMS_BUILD_SHA256_CHECKSUM=394723034b81cc7cd528401775bc7aca2b12c7471c92350c80a0e2fb9d2909fe ARROW_AWS_C_COMMON_BUILD_VERSION=v0.6.9 From b4c55dc3c5b8343924dc263f589e6e2923317475 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Sun, 17 Oct 2021 17:44:26 +0300 Subject: [PATCH 06/16] regress abseil --- cpp/thirdparty/versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 1d871918989..e9bc502a557 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -23,8 +23,8 @@ # `DEPENDENCIES` array (see the comment on top of the declaration for the # format). -ARROW_ABSL_BUILD_VERSION=20210324.2 -ARROW_ABSL_BUILD_SHA256_CHECKSUM=59b862f50e710277f8ede96f083a5bb8d7c9595376146838b9580be90374ee1f +ARROW_ABSL_BUILD_VERSION=20200225.3 +ARROW_ABSL_BUILD_SHA256_CHECKSUM=66d4d009050f39c104b03f79bdca9d930c4964016f74bf24867a43fbdbd00d23 ARROW_AWSSDK_BUILD_VERSION=1.8.133 ARROW_AWSSDK_BUILD_SHA256_CHECKSUM=d6c495bc06be5e21dac716571305d77437e7cfd62a2226b8fe48d9ab5785a8d6 ARROW_AWS_CHECKSUMS_BUILD_VERSION=v0.1.12 From 81959562adff256fa398652d80f58ee5e3844b1a Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Sun, 17 Oct 2021 18:24:51 +0300 Subject: [PATCH 07/16] newest abseil, tests passed for ARROW-14157 --- cpp/thirdparty/versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index e9bc502a557..1d871918989 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -23,8 +23,8 @@ # `DEPENDENCIES` array (see the comment on top of the declaration for the # format). -ARROW_ABSL_BUILD_VERSION=20200225.3 -ARROW_ABSL_BUILD_SHA256_CHECKSUM=66d4d009050f39c104b03f79bdca9d930c4964016f74bf24867a43fbdbd00d23 +ARROW_ABSL_BUILD_VERSION=20210324.2 +ARROW_ABSL_BUILD_SHA256_CHECKSUM=59b862f50e710277f8ede96f083a5bb8d7c9595376146838b9580be90374ee1f ARROW_AWSSDK_BUILD_VERSION=1.8.133 ARROW_AWSSDK_BUILD_SHA256_CHECKSUM=d6c495bc06be5e21dac716571305d77437e7cfd62a2226b8fe48d9ab5785a8d6 ARROW_AWS_CHECKSUMS_BUILD_VERSION=v0.1.12 From b4b02ac1042f70b788fce5f1283d7a641454d1d6 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Sun, 17 Oct 2021 20:48:02 +0300 Subject: [PATCH 08/16] try to get abseil to rebuild --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 32bf0f10ebc..6d08b7c0ac5 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -2425,6 +2425,7 @@ macro(build_absl_once) set(ABSL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/absl_ep-install") set(ABSL_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" -DABSL_RUN_TESTS=OFF -DCMAKE_INSTALL_LIBDIR=lib + "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}" "-DCMAKE_INSTALL_PREFIX=${ABSL_PREFIX}") set(ABSL_BUILD_BYPRODUCTS) set(ABSL_LIBRARIES) From 41818da0528f2d0c51723649c2ebe56b2c8450ba Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Sun, 17 Oct 2021 21:57:10 +0300 Subject: [PATCH 09/16] force rebuild for C++17 and C++14 --- dev/tasks/tasks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 500803c9c4e..748719f4517 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -924,7 +924,7 @@ tasks: params: env: UBUNTU: 20.04 - flags: "-e CMAKE_ARGS=-DCMAKE_CXX_STANDARD={{ cpp_standard }}" + flags: "--no-cache -e CMAKE_ARGS=-DCMAKE_CXX_STANDARD={{ cpp_standard }}" image: ubuntu-cpp {% endfor %} From c8890031e4077be1a8e5cbe922c1afe6dc59f3ac Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Mon, 18 Oct 2021 10:23:00 +0300 Subject: [PATCH 10/16] revert SNAPPY to see if R builds succeed --- cpp/thirdparty/versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 1d871918989..821398d7337 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -76,8 +76,8 @@ ARROW_RAPIDJSON_BUILD_VERSION=1a803826f1197b5e30703afe4b9c0e7dd48074f5 ARROW_RAPIDJSON_BUILD_SHA256_CHECKSUM=0b6b780b6c534bfb0b23d29910bfe361e486bcfeaf106db8bc8995792072905a ARROW_RE2_BUILD_VERSION=2021-09-01 ARROW_RE2_BUILD_SHA256_CHECKSUM=42a2e1d56b5de252f5d418dc1cc0848e9e52ca22b056453988b18c6195ec7f8d -ARROW_SNAPPY_BUILD_VERSION=1.1.9 -ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 +ARROW_SNAPPY_BUILD_VERSION=1.1.8 +ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f ARROW_THRIFT_BUILD_VERSION=0.13.0 ARROW_THRIFT_BUILD_SHA256_CHECKSUM=7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179 ARROW_UTF8PROC_BUILD_VERSION=v2.6.1 From 4f3df3db3543607dda7692cfb3e9edf21ce22ff0 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Mon, 18 Oct 2021 16:57:56 +0300 Subject: [PATCH 11/16] update abseil build to create include --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 6d08b7c0ac5..b53aabc433d 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -2423,12 +2423,15 @@ macro(build_absl_once) if(NOT TARGET absl_ep) message(STATUS "Building Abseil-cpp from source") set(ABSL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/absl_ep-install") + set(ABSL_INCLUDE_DIR "${ABSL_PREFIX}/include") set(ABSL_CMAKE_ARGS "${EP_COMMON_CMAKE_ARGS}" -DABSL_RUN_TESTS=OFF -DCMAKE_INSTALL_LIBDIR=lib "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}" "-DCMAKE_INSTALL_PREFIX=${ABSL_PREFIX}") set(ABSL_BUILD_BYPRODUCTS) set(ABSL_LIBRARIES) + # Create include directory so that GRPC does not fail to build + file(MAKE_DIRECTORY ${ABSL_INCLUDE_DIR}) # Abseil produces the following libraries, each is fairly small, but there # are (as you can see), many of them. We need to add the libraries first, From fd99b55a8e8ecc3f6fc5c59a32f52816ea1da0d3 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Mon, 18 Oct 2021 18:03:24 +0300 Subject: [PATCH 12/16] Revert GRPC to 1.35 --- cpp/thirdparty/versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 141418d2654..db652691618 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -51,8 +51,8 @@ ARROW_GLOG_BUILD_VERSION=v0.5.0 ARROW_GLOG_BUILD_SHA256_CHECKSUM=eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5 ARROW_GOOGLE_CLOUD_CPP_BUILD_VERSION=v1.32.0 ARROW_GOOGLE_CLOUD_CPP_BUILD_SHA256_CHECKSUM=c62338389f76915179fe61d8c0f5fefa06131b4e0d7312707af5309b1394e099 -ARROW_GRPC_BUILD_VERSION=v1.41.0 -ARROW_GRPC_BUILD_SHA256_CHECKSUM=e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656 +ARROW_GRPC_BUILD_VERSION=v1.35.0 +ARROW_GRPC_BUILD_SHA256_CHECKSUM=27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958 ARROW_GTEST_BUILD_VERSION=1.11.0 ARROW_GTEST_BUILD_SHA256_CHECKSUM=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5 ARROW_JEMALLOC_BUILD_VERSION=5.2.1 From faac6f43155822d49116e1a0f28350b804643fc4 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Mon, 18 Oct 2021 19:25:51 +0300 Subject: [PATCH 13/16] try GRPC 1.36.4 --- cpp/thirdparty/versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index db652691618..4d01b8722d6 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -51,8 +51,8 @@ ARROW_GLOG_BUILD_VERSION=v0.5.0 ARROW_GLOG_BUILD_SHA256_CHECKSUM=eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5 ARROW_GOOGLE_CLOUD_CPP_BUILD_VERSION=v1.32.0 ARROW_GOOGLE_CLOUD_CPP_BUILD_SHA256_CHECKSUM=c62338389f76915179fe61d8c0f5fefa06131b4e0d7312707af5309b1394e099 -ARROW_GRPC_BUILD_VERSION=v1.35.0 -ARROW_GRPC_BUILD_SHA256_CHECKSUM=27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958 +ARROW_GRPC_BUILD_VERSION=v1.36.4 +ARROW_GRPC_BUILD_SHA256_CHECKSUM=8eb9d86649c4d4a7df790226df28f081b97a62bf12c5c5fe9b5d31a29cd6541a ARROW_GTEST_BUILD_VERSION=1.11.0 ARROW_GTEST_BUILD_SHA256_CHECKSUM=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5 ARROW_JEMALLOC_BUILD_VERSION=5.2.1 From fe0622be2e6da1996c0c65cdae9c9d3992cde1c0 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Mon, 18 Oct 2021 21:50:53 +0300 Subject: [PATCH 14/16] GRPC 1.35.0 --- cpp/thirdparty/versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 4d01b8722d6..db652691618 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -51,8 +51,8 @@ ARROW_GLOG_BUILD_VERSION=v0.5.0 ARROW_GLOG_BUILD_SHA256_CHECKSUM=eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5 ARROW_GOOGLE_CLOUD_CPP_BUILD_VERSION=v1.32.0 ARROW_GOOGLE_CLOUD_CPP_BUILD_SHA256_CHECKSUM=c62338389f76915179fe61d8c0f5fefa06131b4e0d7312707af5309b1394e099 -ARROW_GRPC_BUILD_VERSION=v1.36.4 -ARROW_GRPC_BUILD_SHA256_CHECKSUM=8eb9d86649c4d4a7df790226df28f081b97a62bf12c5c5fe9b5d31a29cd6541a +ARROW_GRPC_BUILD_VERSION=v1.35.0 +ARROW_GRPC_BUILD_SHA256_CHECKSUM=27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958 ARROW_GTEST_BUILD_VERSION=1.11.0 ARROW_GTEST_BUILD_SHA256_CHECKSUM=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5 ARROW_JEMALLOC_BUILD_VERSION=5.2.1 From 1e25041d2bdea8f823f406390dc4a54442e1106e Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Tue, 19 Oct 2021 19:32:17 +0300 Subject: [PATCH 15/16] indicate version of C++ to use --- cpp/examples/parquet/parquet_arrow/CMakeLists.txt | 6 ++++-- cpp/src/plasma/CMakeLists.txt | 4 +++- matlab/CMakeLists.txt | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cpp/examples/parquet/parquet_arrow/CMakeLists.txt b/cpp/examples/parquet/parquet_arrow/CMakeLists.txt index 43eb21957a2..4f58113a037 100644 --- a/cpp/examples/parquet/parquet_arrow/CMakeLists.txt +++ b/cpp/examples/parquet/parquet_arrow/CMakeLists.txt @@ -27,9 +27,11 @@ include(GNUInstallDirs) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules") # This ensures that things like gnu++11 get passed correctly -set(CMAKE_CXX_STANDARD 11) +if(NOT DEFINED CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) +endif() -# We require a C++11 compliant compiler +# We require a C++11 or higher compliant compiler set(CMAKE_CXX_STANDARD_REQUIRED ON) # Look for installed packages the system diff --git a/cpp/src/plasma/CMakeLists.txt b/cpp/src/plasma/CMakeLists.txt index 46603d6f85c..f10a6196a85 100644 --- a/cpp/src/plasma/CMakeLists.txt +++ b/cpp/src/plasma/CMakeLists.txt @@ -29,7 +29,9 @@ find_package(Threads) # The SO version is also the ABI version set(PLASMA_SO_VERSION "${ARROW_SO_VERSION}") set(PLASMA_FULL_SO_VERSION "${ARROW_FULL_SO_VERSION}") - +if(NOT DEFINED CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) +endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-conversion") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt index 3c3b873ef37..243be045099 100644 --- a/matlab/CMakeLists.txt +++ b/matlab/CMakeLists.txt @@ -181,7 +181,9 @@ macro(build_gtest) add_dependencies(GTest::gtest_main arrow_ep) endmacro() -set(CMAKE_CXX_STANDARD 11) +if(NOT DEFINED CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) +endif() set(MLARROW_VERSION "6.0.0-SNAPSHOT") string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" MLARROW_BASE_VERSION "${MLARROW_VERSION}") From 6407c66db0855efe5f4c7c30778353bd4035f88f Mon Sep 17 00:00:00 2001 From: bkmgit Date: Wed, 17 Nov 2021 18:39:29 +0300 Subject: [PATCH 16/16] revert RE2 --- cpp/thirdparty/versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 7cf99cd17d7..1cc660787fc 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -74,8 +74,8 @@ ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=b8ab9bbdf0c6968cf20060794bc61e231fae82aaf69 # warnings. ARROW_RAPIDJSON_BUILD_VERSION=1a803826f1197b5e30703afe4b9c0e7dd48074f5 ARROW_RAPIDJSON_BUILD_SHA256_CHECKSUM=0b6b780b6c534bfb0b23d29910bfe361e486bcfeaf106db8bc8995792072905a -ARROW_RE2_BUILD_VERSION=2021-09-01 -ARROW_RE2_BUILD_SHA256_CHECKSUM=42a2e1d56b5de252f5d418dc1cc0848e9e52ca22b056453988b18c6195ec7f8d +ARROW_RE2_BUILD_VERSION=2021-02-02 +ARROW_RE2_BUILD_SHA256_CHECKSUM=1396ab50c06c1a8885fb68bf49a5ecfd989163015fd96699a180d6414937f33f ARROW_SNAPPY_BUILD_VERSION=1.1.9 ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 # There is a bug in GCC < 4.9 with Snappy 1.1.9, so revert to 1.1.8 for those (ARROW-14661)