Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-45132: [C++][Gandiva] Update LLVM to 18.1 #45114

Merged
merged 9 commits into from
Feb 3, 2025
Merged

GH-45132: [C++][Gandiva] Update LLVM to 18.1 #45114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e77fae5
GH-45132 Upgrade LLVM to 18.1 which fixes the unexported orc symbol i…
lriggs Jan 24, 2025
cce0e5c
Update default llvm to 18
lriggs Jan 27, 2025
6705fdf
Remove unused variable
lriggs Jan 27, 2025
de2eaf0
Formatting
lriggs Jan 27, 2025
9f61fd2
Not sure why windows machines don't like the patch file. Try removing…
lriggs Jan 28, 2025
521a7be
Add back space to ports.patch file to match previous format.
lriggs Jan 28, 2025
55e0c81
Don't need llvm 18 here
lriggs Jan 30, 2025
7f4efe5
Update PYTHON_WHEEL_WINDOWS_IMAGE_REVISION
lriggs Feb 3, 2025
5044ccb
Merge branch 'main' into apache_main_lriggs
lriggs Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ HDFS=3.2.1
JDK=11
KARTOTHEK=latest
# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
LLVM=14
LLVM=18
MAVEN=3.8.7
NODE=18
NUMBA=latest
Expand All @@ -89,13 +89,13 @@ TZ=UTC
# Used through docker-compose.yml and serves as the default version for the
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
# docker tags more readable.
VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01" # 2024.04.26 Release
VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
# This is a workaround for our CI problem that "archery docker build" doesn't
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-01-27
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-02-03
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-01-27

# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
Expand Down
9 changes: 4 additions & 5 deletions ci/vcpkg/ports.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,16 @@ index a79c72a59..6b7fa6a66 100644

vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
index 0c7098082..c603c3653 100644
index 0312b2ae1..fdb576b5f 100644
--- a/ports/snappy/portfile.cmake
+++ b/ports/snappy/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_github(
PATCHES
@@ -8,5 +8,6 @@ vcpkg_from_github(
fix_clang-cl_build.patch
no-werror.patch
pkgconfig.diff
+ "snappy-disable-bmi.patch"
)

vcpkg_cmake_configure(
file(COPY "${CURRENT_PORT_DIR}/snappy.pc.in" DESTINATION "${SOURCE_PATH}")
diff --git a/ports/snappy/snappy-disable-bmi.patch b/ports/snappy/snappy-disable-bmi.patch
new file mode 100644
index 000000000..e839c93a4
Expand Down
1 change: 1 addition & 0 deletions ci/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
{
"name": "llvm",
"default-features": false,
"version>=": "18.1",
"features": [
"clang",
"default-targets",
Expand Down
Loading