Skip to content

Commit d1e5cb5

Browse files
authored
GH-33851: [C++] Update bundled boost version (#33890)
This PR updates the bundled version of Boost, as it was suggested by a maintainer of CRAN (R packaging) that the older version of boost might be responsible for an Arrow build failure on Fedora/clang (#33819). Closes #33851. The resulting tarball also has to be uploaded to https://apache.jfrog.io/ui/native/arrow/thirdparty/7.0.0/ (right?) to kick in and almost certainly needs to be tested through a round of CI. I'm not sure how to do either of those things but perhaps @ assignUser does? * Closes: #33851 Authored-by: Dewey Dunnington <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent 771c37a commit d1e5cb5

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

cpp/build-support/trim-boost.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@
2424
#
2525
# To test building Arrow locally with the boost bundle this creates, add:
2626
#
27-
# set(BOOST_SOURCE_URL /path/to/arrow/cpp/build-support/boost_1_75_0/boost_1_75_0.tar.gz)
27+
# set(BOOST_SOURCE_URL /path/to/arrow/cpp/build-support/boost_1_81_0/boost_1_81_0.tar.gz)
2828
#
2929
# to the beginning of the build_boost() macro in ThirdpartyToolchain.cmake,
3030
#
3131
# or set the env var ARROW_BOOST_URL before calling cmake, like:
3232
#
33-
# ARROW_BOOST_URL=/path/to/arrow/cpp/build-support/boost_1_75_0/boost_1_75_0.tar.gz cmake ...
33+
# ARROW_BOOST_URL=/path/to/arrow/cpp/build-support/boost_1_81_0/boost_1_81_0.tar.gz cmake ...
3434
#
3535
# After running this script, upload the bundle to
36-
# https://github.com/ursa-labs/thirdparty/releases/edit/latest
36+
# https://apache.jfrog.io/artifactory/arrow/thirdparty/
3737
# TODO(ARROW-6407) automate uploading to github
3838

3939
set -eu
4040

4141
# if version is not defined by the caller, set a default.
42-
: ${BOOST_VERSION:=1.75.0}
42+
: ${BOOST_VERSION:=1.81.0}
4343
: ${BOOST_FILE:=boost_${BOOST_VERSION//./_}}
4444
: ${BOOST_URL:=https://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/${BOOST_FILE}.tar.gz}
4545

@@ -66,6 +66,9 @@ fi
6666
mkdir -p ${BOOST_FILE}
6767
./dist/bin/bcp ${BOOST_LIBS} ${BOOST_FILE}
6868

69+
# These files are assumed by the thirdparty toolchain but are not copied by bcp
70+
cp bootstrap.sh bootstrap.bat boostcpp.jam boost-build.jam Jamroot LICENSE_1_0.txt INSTALL ${BOOST_FILE}/
71+
6972
tar -czf ${BOOST_FILE}.tar.gz ${BOOST_FILE}/
7073
# Resulting tarball is in ${BOOST_FILE}/${BOOST_FILE}.tar.gz
7174

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,18 @@ if(MSVC AND ARROW_USE_STATIC_CRT)
989989
set(Boost_USE_STATIC_RUNTIME ON)
990990
endif()
991991
set(Boost_ADDITIONAL_VERSIONS
992+
"1.81.0"
993+
"1.81"
994+
"1.80.0"
995+
"1.80"
996+
"1.79.0"
997+
"1.79"
998+
"1.78.0"
999+
"1.78"
1000+
"1.77.0"
1001+
"1.77"
1002+
"1.76.0"
1003+
"1.76"
9921004
"1.75.0"
9931005
"1.75"
9941006
"1.74.0"

cpp/thirdparty/versions.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ ARROW_AWS_C_COMMON_BUILD_VERSION=v0.6.9
3333
ARROW_AWS_C_COMMON_BUILD_SHA256_CHECKSUM=928a3e36f24d1ee46f9eec360ec5cebfe8b9b8994fe39d4fa74ff51aebb12717
3434
ARROW_AWS_C_EVENT_STREAM_BUILD_VERSION=v0.1.5
3535
ARROW_AWS_C_EVENT_STREAM_BUILD_SHA256_CHECKSUM=f1b423a487b5d6dca118bfc0d0c6cc596dc476b282258a3228e73a8f730422d4
36-
ARROW_BOOST_BUILD_VERSION=1.75.0
37-
ARROW_BOOST_BUILD_SHA256_CHECKSUM=267e04a7c0bfe85daf796dedc789c3a27a76707e1c968f0a2a87bb96331e2b61
36+
ARROW_BOOST_BUILD_VERSION=1.81.0
37+
ARROW_BOOST_BUILD_SHA256_CHECKSUM=9e0ffae35528c35f90468997bc8d99500bf179cbae355415a89a600c38e13574
3838
ARROW_BROTLI_BUILD_VERSION=v1.0.9
3939
ARROW_BROTLI_BUILD_SHA256_CHECKSUM=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
4040
ARROW_BZIP2_BUILD_VERSION=1.0.8
@@ -107,7 +107,7 @@ DEPENDENCIES=(
107107
"ARROW_AWS_CHECKSUMS_URL aws-checksums-${ARROW_AWS_CHECKSUMS_BUILD_VERSION}.tar.gz https://github.com/awslabs/aws-checksums/archive/${ARROW_AWS_CHECKSUMS_BUILD_VERSION}.tar.gz"
108108
"ARROW_AWS_C_COMMON_URL aws-c-common-${ARROW_AWS_C_COMMON_BUILD_VERSION}.tar.gz https://github.com/awslabs/aws-c-common/archive/${ARROW_AWS_C_COMMON_BUILD_VERSION}.tar.gz"
109109
"ARROW_AWS_C_EVENT_STREAM_URL aws-c-event-stream-${ARROW_AWS_C_EVENT_STREAM_BUILD_VERSION}.tar.gz https://github.com/awslabs/aws-c-event-stream/archive/${ARROW_AWS_C_EVENT_STREAM_BUILD_VERSION}.tar.gz"
110-
"ARROW_BOOST_URL boost-${ARROW_BOOST_BUILD_VERSION}.tar.gz https://github.com/ursa-labs/thirdparty/releases/download/apache-arrow-7.0.0/boost_${ARROW_BOOST_BUILD_VERSION//./_}.tar.gz"
110+
"ARROW_BOOST_URL boost-${ARROW_BOOST_BUILD_VERSION}.tar.gz https://apache.jfrog.io/artifactory/arrow/thirdparty/7.0.0/boost_${ARROW_BOOST_BUILD_VERSION//./_}.tar.gz"
111111
"ARROW_BROTLI_URL brotli-${ARROW_BROTLI_BUILD_VERSION}.tar.gz https://github.com/google/brotli/archive/${ARROW_BROTLI_BUILD_VERSION}.tar.gz"
112112
"ARROW_BZIP2_URL bzip2-${ARROW_BZIP2_BUILD_VERSION}.tar.gz https://sourceware.org/pub/bzip2/bzip2-${ARROW_BZIP2_BUILD_VERSION}.tar.gz"
113113
"ARROW_CARES_URL cares-${ARROW_CARES_BUILD_VERSION}.tar.gz https://c-ares.haxx.se/download/c-ares-${ARROW_CARES_BUILD_VERSION}.tar.gz"

0 commit comments

Comments
 (0)