-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Ubuntu 24.04 support & upgrade arrow 18 (#151)
* add ubuntu 24.04 support;upgrade arrow18 * add libxml2 * Update build.yml * Update docker.yml * Update build.yml * Update docker.yml * Update libxml2.cmake * Update boost.cmake * Update boost.cmake * Update install-third-party.sh * Update build.yml * Update install-third-party.sh * Delete project/patches/arrow-11.0.0.patch * Update libxml2.cmake * Update arrow.cmake * Update libxml2.cmake * Update libxml2.cmake * Update build.yml
- Loading branch information
1 parent
6e04c3f
commit 0d43d91
Showing
11 changed files
with
161 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| FROM ubuntu:24.04 | ||
| SHELL ["/bin/bash", "-c"] | ||
| ARG DEBIAN_FRONTEND=noninteractive | ||
| ARG GOLANG_VERSION=1.21.6 | ||
| RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone | ||
| RUN apt update \ | ||
| && apt install -y make \ | ||
| git \ | ||
| m4 \ | ||
| curl \ | ||
| wget \ | ||
| unzip \ | ||
| xz-utils \ | ||
| patch \ | ||
| python3 \ | ||
| python3-dev \ | ||
| lsb-release \ | ||
| zlib1g-dev \ | ||
| build-essential \ | ||
| libreadline-dev \ | ||
| libncurses-dev \ | ||
| cmake \ | ||
| libtool \ | ||
| automake \ | ||
| autoconf \ | ||
| autoconf-archive \ | ||
| autotools-dev \ | ||
| bison \ | ||
| flex \ | ||
| gperf \ | ||
| gettext \ | ||
| ninja-build \ | ||
| groff-base \ | ||
| texinfo \ | ||
| && apt clean \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| # Install golang | ||
| RUN ARCH="$(uname -m)"; \ | ||
| case "${ARCH}" in \ | ||
| x86_64) GOARCH='amd64';; \ | ||
| aarch64) GOARCH='arm64';; \ | ||
| *) echo "Unsupported architecture: ${ARCH}" && exit 1;; \ | ||
| esac; \ | ||
| curl -L https://go.dev/dl/go${GOLANG_VERSION}.linux-${GOARCH}.tar.gz -o go.tar.gz && \ | ||
| tar -C /usr/local -xzf go.tar.gz && \ | ||
| rm go.tar.gz | ||
| ENV PATH="/usr/local/go/bin:${PATH}" | ||
|
|
||
| # Install ossutil | ||
| RUN curl https://gosspublic.alicdn.com/ossutil/install.sh | bash | ||
|
|
||
| # Install MinIO Client | ||
| RUN if [ "$(uname -m)" = "aarch64" ]; then \ | ||
| curl -O https://dl.min.io/client/mc/release/linux-arm64/mc; \ | ||
| else \ | ||
| curl -O https://dl.min.io/client/mc/release/linux-amd64/mc; \ | ||
| fi \ | ||
| && chmod +x mc \ | ||
| && mv mc /usr/local/bin | ||
|
|
||
| ENV PACKAGE_DIR=/usr/src/third-party | ||
| RUN mkdir -p ${PACKAGE_DIR} | ||
| WORKDIR ${PACKAGE_DIR} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,4 +44,3 @@ ExternalProject_Add_Step(${name} clean | |
| ) | ||
|
|
||
| ExternalProject_Add_StepTargets(${name} clean) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| # Copyright (c) 2024 vesoft inc. All rights reserved. | ||
| # | ||
| # This source code is licensed under Apache 2.0 License. | ||
|
|
||
| set(name libxml2) | ||
| set(source_dir ${CMAKE_CURRENT_BINARY_DIR}/${name}/source) | ||
|
|
||
| ExternalProject_Add( | ||
| ${name} | ||
| URL https://github.com/GNOME/libxml2/archive/refs/tags/v2.13.4.tar.gz | ||
| URL_HASH MD5=69d7c63c7fe5858ba7a462f303939c4a | ||
| DOWNLOAD_NAME libxml2-v2.13.4.tar.gz | ||
| PREFIX ${CMAKE_CURRENT_BINARY_DIR}/${name} | ||
| TMP_DIR ${BUILD_INFO_DIR} | ||
| STAMP_DIR ${BUILD_INFO_DIR} | ||
| DOWNLOAD_DIR ${DOWNLOAD_DIR} | ||
| SOURCE_DIR ${source_dir} | ||
| CMAKE_ARGS | ||
| ${common_cmake_args} | ||
| -DCMAKE_BUILD_TYPE=Release | ||
| -DBUILD_SHARED_LIBS=ON | ||
| -DLIBXML2_WITH_ICONV=OFF | ||
| -DLIBXML2_WITH_LZMA=OFF | ||
| -DLIBXML2_WITH_PYTHON=OFF | ||
| -DLIBXML2_WITH_ZLIB=OFF | ||
| BUILD_COMMAND make -s -j${BUILDING_JOBS_NUM} | ||
| BUILD_IN_SOURCE 1 | ||
| INSTALL_COMMAND make -s install -j${BUILDING_JOBS_NUM} | ||
| LOG_CONFIGURE TRUE | ||
| LOG_BUILD TRUE | ||
| LOG_INSTALL TRUE | ||
| ) | ||
|
|
||
| ExternalProject_Add_Step(${name} clean | ||
| EXCLUDE_FROM_MAIN TRUE | ||
| ALWAYS TRUE | ||
| DEPENDEES configure | ||
| COMMAND make clean -j | ||
| COMMAND rm -f ${BUILD_INFO_DIR}/${name}-build | ||
| WORKING_DIRECTORY ${source_dir} | ||
| ) | ||
|
|
||
| ExternalProject_Add_StepTargets(${name} clean) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| --- a/cpp/cmake_modules/GandivaAddBitcode.cmake 2024-10-16 09:20:06.000000000 +0000 | ||
| +++ b/cpp/cmake_modules/GandivaAddBitcode.cmake 2024-11-05 10:07:31.339538160 +0000 | ||
| @@ -30,6 +30,16 @@ | ||
| -fms-compatibility-version=${FMS_COMPATIBILITY}) | ||
| endif() | ||
|
|
||
| + if (USE_LLVM_CXX) | ||
| + message(STATUS "USE LLVM CXX") | ||
| + file(GLOB_RECURSE LLVM_CXX_INCLUDE_DIR | ||
| + "${LLVM_INCLUDE_DIRS}/*-gnu/c++/v1/__config_site") | ||
| + | ||
| + list(GET LLVM_CXX_INCLUDE_DIR 0 LLVM_CXX_INCLUDE_DIR) | ||
| + get_filename_component(LLVM_CXX_INCLUDE_DIR ${LLVM_CXX_INCLUDE_DIR} DIRECTORY) | ||
| + list(APPEND CLANG_OPTIONS -I${LLVM_INCLUDE_DIRS}/c++/v1 -I${LLVM_CXX_INCLUDE_DIR}) | ||
| + endif() | ||
| + | ||
| get_filename_component(SOURCE_BASE ${SOURCE} NAME_WE) | ||
| get_filename_component(ABSOLUTE_SOURCE ${SOURCE} ABSOLUTE) | ||
| set(BC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_BASE}.bc) | ||
| --- a/cpp/src/arrow/testing/process.cc 2024-11-05 08:13:47.487969501 +0000 | ||
| +++ b/cpp/src/arrow/testing/process.cc 2024-11-05 09:27:42.138928785 +0000 | ||
| @@ -18,7 +18,7 @@ | ||
| #include "arrow/testing/process.h" | ||
| #include "arrow/result.h" | ||
|
|
||
| -#define BOOST_PROCESS_AVAILABLE | ||
| +#undef BOOST_PROCESS_AVAILABLE | ||
| #ifdef __EMSCRIPTEN__ | ||
| # undef BOOST_PROCESS_AVAILABLE | ||
| #endif |