This is an automated email from the ASF dual-hosted git repository.
adonisling pushed a commit to branch clucene
in repository https://gitbox.apache.org/repos/asf/doris-thirdparty.git
The following commit(s) were added to refs/heads/clucene by this push:
new fc06111 [chore] Porting to Clang-16 (#49)
fc06111 is described below
commit fc06111229debbbbbae0b07ac83124e637e6aba2
Author: Adonis Ling <adonis0...@gmail.com>
AuthorDate: Wed Mar 29 10:36:12 2023 +0800
[chore] Porting to Clang-16 (#49)
Currently, some errors occur when building clucene by Clang-16. This PR
fixes these errors.
---
.github/workflows/build.yml | 22 ++++++++++++++--------
cmake/TurboPFOR.cmake | 2 +-
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d9dcacc..aaa65fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
'openjdk@11'
'maven'
'node'
- 'llvm@15'
+ 'llvm@16'
- name: Linux
os: ubuntu-22.04
@@ -82,9 +82,15 @@ jobs:
cd /tmp
curl -L
https://sourceforge.net/projects/libpng/files/zlib/1.2.11/zlib-1.2.11.tar.gz |
tar -zxf -
- curl -L
https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.gz
-o - | tar -zxf -
+ curl -L
https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.gz
-o - | tar -zxf -
if [[ "${{ matrix.config.name }}" == 'macOS' ]]; then
+ pushd "$(brew --repo)"
+ git fetch
+ git reset --hard origin/master
+ brew update
+ popd
+
brew install ${{ matrix.config.packages }}
CELLARS=(${{ matrix.config.packages }})
@@ -93,8 +99,8 @@ jobs:
done
export PATH="${EXPORT_CELLARS}:/usr/bin:${PATH}"
- export CC="$(brew --prefix)/opt/llvm@15/bin/clang"
- export CXX="$(brew --prefix)/opt/llvm@15/bin/clang++"
+ export CC="$(brew --prefix)/opt/llvm@16/bin/clang"
+ export CXX="$(brew --prefix)/opt/llvm@16/bin/clang++"
boost_toolset=clang
else
sudo apt update
@@ -133,12 +139,12 @@ jobs:
popd
# Install Boost
- pushd boost_1_73_0
+ pushd boost_1_81_0
CXXFLAGS="${cxxflags}" ./bootstrap.sh --prefix="${INSTALLED_DIR}"
--with-toolset="${boost_toolset}"
# -q: Fail at first error
sudo ./b2 -q link=static runtime-link=static -j "$(nproc)"
--without-mpi --without-graph \
--without-graph_parallel --without-python \
- cxxflags="-std=c++11 -g -I${INSTALLED_DIR}/include
-L${INSTALLED_DIR}/lib" install
+ cxxflags="-std=c++17 -g -I${INSTALLED_DIR}/include
-L${INSTALLED_DIR}/lib" install
popd
- name: Checkout ${{ github.ref }}
@@ -155,8 +161,8 @@ jobs:
done
export PATH="${EXPORT_CELLARS}:/usr/bin:${PATH}"
- export CC="$(brew --prefix)/opt/llvm@15/bin/clang"
- export CXX="$(brew --prefix)/opt/llvm@15/bin/clang++"
+ export CC="$(brew --prefix)/opt/llvm@16/bin/clang"
+ export CXX="$(brew --prefix)/opt/llvm@16/bin/clang++"
warning_narrowing='-Wno-c++11-narrowing'
else
export DEFAULT_DIR='/opt'
diff --git a/cmake/TurboPFOR.cmake b/cmake/TurboPFOR.cmake
index b2e0bea..a742968 100644
--- a/cmake/TurboPFOR.cmake
+++ b/cmake/TurboPFOR.cmake
@@ -2,7 +2,7 @@ PROJECT(turbo-pfor)
set(PFOR_SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/ext/for)
add_custom_target(build_ic ALL
- COMMAND make USE_AVX2=${USE_AVX2} libic.a -j 8
+ COMMAND make OPT='-Wno-implicit-function-declaration -Wno-implicit-int
-Wno-int-conversion' USE_AVX2=${USE_AVX2} libic.a -j 8
WORKING_DIRECTORY ${PFOR_SOURCE_DIR}
COMMENT "Original Turbo-PFOR makefile target")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
