mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

ci: Rebuild Fedora 41 image with updates

Browse Source 
In particular, get:

* flang-19.1.0-2.fc41 to restore OpenMP support
* IWYU 0.23 for LLVM/Clang 19 support
This commit is contained in:
Brad King
2024-11-11 14:00:52 -05:00
parent 7f2dba2748
commit fff8e3f6f3
4 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/ci/configure_fedora41_common_clang.cmake
View File

@@ -11,7 +11,7 @@ set(CMake_TEST_FindOpenACC_CXX "ON" CACHE BOOL "")
set(CMake_TEST_FindOpenACC_Fortran "OFF" CACHE BOOL "") # flang-new fails producing LLVM IR set(CMake_TEST_FindOpenACC_Fortran "OFF" CACHE BOOL "") # flang-new fails producing LLVM IR
set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "")
set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "")
set(CMake_TEST_FindOpenMP_Fortran "OFF" CACHE BOOL "") # https://bugzilla.redhat.com/show_bug.cgi?id=2321571 set(CMake_TEST_FindOpenMP_Fortran "ON" CACHE BOOL "")
set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")

2
.gitlab/ci/docker/fedora41/deps_packages.lst
View File

@@ -10,7 +10,7 @@ clang-devel
clang-tools-extra clang-tools-extra
clang-tools-extra-devel clang-tools-extra-devel
compiler-rt compiler-rt
flang flang-19.1.0-2.fc41
gcc-c++ gcc-c++
git-core git-core
lfortran lfortran

22
.gitlab/ci/docker/fedora41/install_iwyu.sh
View File

@@ -15,29 +15,15 @@ git clone "https://github.com/include-what-you-use/include-what-you-use.git"
cd include-what-you-use cd include-what-you-use
readonly llvm_full_version="$( clang --version | head -n1 | cut -d' ' -f3 )" readonly llvm_full_version="$( clang --version | head -n1 | cut -d' ' -f3 )"
readonly llvm_version="$( echo "$llvm_full_version" | cut -d. -f-1 )" readonly llvm_version="$( echo "$llvm_full_version" | cut -d. -f-1 )"
#FIXME(IWYU): Create clang_19 branch. git checkout "clang_$llvm_version"
#git checkout "clang_$llvm_version"
git checkout d2d092919f2774b5463e236e1ee9d56fb46ceb60 # 2024-10-05
git apply <<EOF
diff --git a/iwyu_driver.cc b/iwyu_driver.cc
index dd4b046..cfd568a 100644
--- a/iwyu_driver.cc
+++ b/iwyu_driver.cc
@@ -249,6 +249,7 @@ bool ExecuteAction(int argc, const char** argv,
/*CodeGenOpts=*/nullptr);
Driver driver(path, getDefaultTargetTriple(), *diagnostics);
+ driver.ResourceDir = "/usr/lib64/clang/$llvm_full_version";
driver.setTitle("include what you use");
// Expand out any response files passed on the command line
EOF
mkdir build mkdir build
cd build cd build
cmake -GNinja \ cmake -GNinja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
"-DCMAKE_INSTALL_PREFIX=/usr/local/lib64/llvm-$llvm_version" \ "-DIWYU_RESOURCE_RELATIVE_TO=clang" \
"-DIWYU_RESOURCE_DIR=../lib/clang/$llvm_version" \
"-DCMAKE_INSTALL_PREFIX=/usr/local/lib/llvm-$llvm_version" \
.. ..
ninja ninja
DESTDIR=/root/iwyu-destdir ninja install DESTDIR=/root/iwyu-destdir ninja install

2
.gitlab/os-linux.yml
View File

@@ -65,7 +65,7 @@
### Fedora ### Fedora
.fedora41: .fedora41:
image: "kitware/cmake:ci-fedora41-x86_64-2024-10-23" image: "kitware/cmake:ci-fedora41-x86_64-2024-11-11"
variables: variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes"