Skip to content

Commit 1fdf0e4

Browse files
[Arrow] Bump to v19.0.0 and build for riscv (#10376)
* [Arrow] Bump to v19.0.0 and build for riscv * Switch to archive source * fix dir name * Match gcc to boost version * drop upstreamed patch * bump zstd * Disable MIMALLOC in build configuration until upstream PR is merged * Bump snappy * UMP brotli * Bump bzip2 * retrigger build
1 parent 4ff5114 commit 1fdf0e4

File tree

2 files changed

+12
-28
lines changed

2 files changed

+12
-28
lines changed

A/Arrow/build_tarballs.jl

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,20 @@
33
using BinaryBuilder, Pkg
44

55
name = "Arrow"
6-
# This installs Arrow 18.1.0.
7-
# We declare this as 18.1.1 because we enabled the Zstd library, changing the package dependencies.
8-
version = v"18.1.1"
6+
version = v"19.0.0"
97

108
# Collection of sources required to complete build
119
sources = [
12-
GitSource("https://github.com/apache/arrow.git",
13-
"6a0414bd9a91e890ec6a45369bf61f405180628c"),
10+
ArchiveSource("https://dlcdn.apache.org/arrow/arrow-$version/apache-arrow-$version.tar.gz",
11+
"f89b93f39954740f7184735ff1e1d3b5be2640396febc872c4955274a011f56b"),
1412
DirectorySource("bundled"),
1513
]
1614

1715
# Bash recipe for building across all platforms
1816
script = raw"""
19-
20-
cd $WORKSPACE/srcdir/arrow
17+
cd $WORKSPACE/srcdir/apache-arrow-*
2118
2219
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/boost.patch
23-
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/windows.patch
2420
if [[ $target == *mingw32* ]]; then
2521
# This hard-codes the name and location of the zstd library and
2622
# must not be applied on other architectures
@@ -41,6 +37,7 @@ CMAKE_FLAGS=(
4137
-DARROW_DEPENDENCY_SOURCE=SYSTEM
4238
-DARROW_IPC=OFF
4339
-DARROW_JEMALLOC=OFF
40+
-DARROW_MIMALLOC=OFF # We could turn this on when https://github.com/apache/arrow/pull/42090 is merged
4441
-DARROW_PARQUET=ON
4542
-DARROW_SIMD_LEVEL=NONE
4643
-DARROW_THRIFT_USE_SHARED=ON
@@ -83,17 +80,17 @@ products = [
8380

8481
# Dependencies that must be installed before this package can be built
8582
dependencies = [
86-
Dependency("Bzip2_jll"; compat="1.0.8"),
83+
Dependency("Bzip2_jll"; compat="1.0.9"),
8784
Dependency("CompilerSupportLibraries_jll"; platforms=filter(!Sys.isbsd, platforms)),
8885
Dependency("Lz4_jll"),
89-
Dependency("Thrift_jll"; compat="0.21"),
86+
Dependency("Thrift_jll"; compat="0.21.1"),
9087
Dependency("Zlib_jll"),
91-
Dependency("Zstd_jll"; compat="1.5.6"),
92-
Dependency("boost_jll"; compat="=1.79.0"),
93-
Dependency("brotli_jll"; compat="1.1.0"),
94-
Dependency("snappy_jll"; compat="1.2.1"),
88+
Dependency("Zstd_jll"; compat="1.5.7"),
89+
Dependency("boost_jll"; compat="=1.87.0"),
90+
Dependency("brotli_jll"; compat="1.1.1"),
91+
Dependency("snappy_jll"; compat="1.2.2"),
9592
]
9693

9794
# Build the tarballs, and possibly a `build.jl` as well.
9895
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
99-
clang_use_lld=false, julia_compat="1.6", preferred_gcc_version=v"8")
96+
clang_use_lld=false, julia_compat="1.6", preferred_gcc_version=v"11.1")

A/Arrow/bundled/patches/windows.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)