Back out "Bump to clang 20 (alisw#5988)"

Original commit changeset: 3e7f035

Author: ehellbar

clang.sh

@@ -1,6 +1,6 @@
 package: Clang
-version: "v20.1.7"
-tag: "llvmorg-20.1.7-alice2"
+version: "v18.1.8"
+tag: "llvmorg-18.1.8-alice2"
 source: https://github.com/alisw/llvm-project-reduced
 requires:
   - "GCC-Toolchain:(?!osx)"
@@ -53,14 +53,13 @@ cmake "$SOURCEDIR/llvm" \
   -DLLVM_BUILD_LLVM_DYLIB=ON \
   -DLLVM_ENABLE_RTTI=ON \
   -DBUILD_SHARED_LIBS=OFF \
-  -DLIBCXXABI_USE_LLVM_UNWINDER=OFF 
-  
+  -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \
+  ${GCC_TOOLCHAIN_ROOT:+-DGCC_INSTALL_PREFIX=$GCC_TOOLCHAIN_ROOT}
+
 cmake --build . -- ${JOBS:+-j$JOBS} install
 
 if [[ $PKGVERSION == v18.1.* ]]; then
   SPIRV_TRANSLATOR_VERSION="v18.1.3"
-elif [[ $PKGVERSION == v20.1.* ]]; then
-  SPIRV_TRANSLATOR_VERSION="v20.1.3"
 else
   SPIRV_TRANSLATOR_VERSION="${PKGVERSION%%.*}.0.0"
 fi
@@ -105,28 +104,12 @@ mv "$INSTALLROOT"/bin/git-clang* "$INSTALLROOT/bin-safe/"  # we also need git-cl
 sed -i.bak -e "s|bin/clang|bin-safe/clang|g" "$INSTALLROOT/lib/cmake/clang/ClangTargets-release.cmake"
 rm "$INSTALLROOT"/lib/cmake/clang/*.bak
 
-# Allow clang to find our own GCC. Notice the cat does not expand variables because
-# we want to resolve the environment when we run, not when we build this, to avoid
-# relocation issues in case GCC and clang are not built at the same time.
-if [ ! "X$GCC_TOOLCHAIN_ROOT" = X ]; then
-  cat > "$INSTALLROOT/bin-safe/$(clang --print-target-triple)-clang++.cfg" << \EOF
---gcc-toolchain=$GCC_TOOLCHAIN_ROOT
-EOF
-  cat > "$INSTALLROOT/bin-safe/$(clang --print-target-triple)-clang.cfg" << \EOF
---gcc-toolchain=$GCC_TOOLCHAIN_ROOT
-EOF
-  cat > "$INSTALLROOT/bin-safe/$(clang --print-target-triple)-clang-cpp.cfg" << \EOF
---gcc-toolchain=$GCC_TOOLCHAIN_ROOT
-EOF
-fi
-
 # Check it actually works
 cat << \EOF > test.cc
 #include <iostream>
 EOF
 "$INSTALLROOT/bin-safe/clang++" -v -c test.cc
 
-
 # Modulefile
 mkdir -p etc/modulefiles
 cat > "etc/modulefiles/$PKGNAME" <<EoF

o2checkcode.sh

@@ -16,16 +16,14 @@ cp "${O2_ROOT}"/compile_commands.json .
 # We will try to setup a list of files to be checked by using 2 specific Git commits to compare
 
 # Heuristically guess source directory
-
 O2_SRC=$(python3 -c 'import json, os; print(os.path.commonpath([x["file"] for x in json.loads(open("compile_commands.json").read()) if "sw/BUILD" not in x["file"] and "G__" not in x["file"] and x["file"].endswith(".cxx")]))')
-[[ -e "$O2_SRC"/CMakeLists.txt ]]
+[[ -e "$O2_SRC"/CMakeLists.txt && -d "$O2_SRC"/.git ]]
 
 # We have something to compare our working directory to (ALIBUILD_BASE_HASH). We check only the
 # changed files (including the untracked ones) if the list of relevant files that changed is up to
 # 50 entries long
 if [[ $ALIBUILD_BASE_HASH ]]; then
   pushd "$O2_SRC"
-    [[ -d .git ]]
     ( git diff --name-only $ALIBUILD_BASE_HASH${ALIBUILD_HEAD_HASH:+...$ALIBUILD_HEAD_HASH} || true ; git ls-files --others --exclude-standard ) | ( grep -E '\.cxx$|\.h$' || true ) | sort -u > $BUILDDIR/changed
     if [[ $(cat $BUILDDIR/changed | wc -l) -le 50 ]]; then
       O2_CHECKCODE_CHANGEDFILES=$(while read FILE; do [[ -e "$O2_SRC/$FILE" ]] && echo "$FILE" || true; done < <(cat $BUILDDIR/changed) | \
@@ -64,13 +62,11 @@ CHECKS="${O2_CHECKER_CHECKS:--*\
 ,readability-braces-around-statements\
 }"
 
-echo $CHECKS
-$CLANG_ROOT/bin-safe/clang-tidy --load $O2CODECHECKER_ROOT/lib/libclangTidyAliceO2Module.so --list-checks -checks="*"
 # Run C++ checks
 run_O2CodeChecker.py ${JOBS+-j $JOBS} \
-	-clang-tidy-binary $CLANG_ROOT/bin-safe/clang-tidy \
+	-clang-tidy-binary $(which O2codecheck) \
 	-clang-apply-replacements-binary "$CLANG_ROOT/bin-safe/clang-apply-replacements" \
-  -extra-args="--load $O2CODECHECKER_ROOT/lib/libclangTidyAliceO2Module.so ${GCC_TOOLCHAIN_REVISION:+--extra-arg=--gcc-install-dir=$(find \"$GCC_TOOLCHAIN_ROOT/lib\" -name crtbegin.o -exec dirname {} \;)}" \
+	${GCC_TOOLCHAIN_REVISION:+-extra-args="--extra-arg=--gcc-install-dir=`find "$GCC_TOOLCHAIN_ROOT/lib" -name crtbegin.o -exec dirname {} \;`"} \
 	-header-filter='.*SOURCES(?!.*/3rdparty/).*' \
         ${O2_CHECKER_FIX:+-fix} -checks="$CHECKS" 2>&1 | tee error-log.txt
 

o2codechecker.sh

@@ -1,39 +1,47 @@
 package: o2codechecker
-version: v20.1.7
-tag: v20.1.7
+version: v18.1.2
+tag: v18.1.2
 requires:
   - Clang:(?!osx*)
 build_requires:
   - CMake
-  - alibuild-recipe-tools
-  - ninja
 source: https://github.com/AliceO2Group/O2CodeChecker.git
 incremental_recipe: |
-  cmake --build . -- ${JOBS:+-j$JOBS} install
+  make ${JOBS+-j$JOBS} install
   mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
 ---
 #!/bin/bash -e
 case $ARCHITECTURE in
   osx*)
-    # use compatible llvm@20 from brew, if available. This
+    # use compatible llvm@18 from brew, if available. This
     # must match the prefer_system_check in clang.sh
-    CLANG_ROOT=`brew --prefix llvm@20`
+    CLANG_ROOT=`brew --prefix llvm@18`
   ;;
     *) ;;
 esac
-cmake $SOURCEDIR -G Ninja                                \
-                 -DCMAKE_INSTALL_PREFIX=$INSTALLROOT     \
+cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT     \
                  -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE    \
                  -DClang_DIR=$CLANG_ROOT/lib/cmake/clang \
                  -DLLVM_DIR=$CLANG_ROOT/lib/cmake/llvm
-cmake --build . -- ${JOBS:+-j$JOBS} install
+make ${JOBS+-j$JOBS} install
 ctest
 
 # Modulefile
 mkdir -p etc/modulefiles
-alibuild-generate-module --bin --lib --cmake > "etc/modulefiles/$PKGNAME"
-
-cat >> "etc/modulefiles/$PKGNAME" <<EoF
+cat > etc/modulefiles/$PKGNAME <<EoF
+#%Module1.0
+proc ModulesHelp { } {
+  global version
+  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
+}
+set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
+module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
+# Dependencies
+module load BASE/1.0 ${CLANG_REVISION:+Clang/$CLANG_VERSION-$CLANG_REVISION}
+# Our environment
+set O2CODECHECKER_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 setenv O2CODECHECKER_ROOT \$O2CODECHECKER_ROOT
+prepend-path PATH \$O2CODECHECKER_ROOT/bin
+prepend-path LD_LIBRARY_PATH \$O2CODECHECKER_ROOT/lib
 EoF
 mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles