From a5b5db0e92441764ce99bbface7b2adbbb63e52d Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Mon, 11 Apr 2022 14:36:32 +0200 Subject: [PATCH] llvm 8.0.1 fedora 34 compliance --- products/GMSHPLUGIN.pyconf | 5 ----- products/llvm.pyconf | 2 +- .../llvm-8.0.1-clang-FD34-gcc-11.0.patch | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 products/patches/llvm-8.0.1-clang-FD34-gcc-11.0.patch diff --git a/products/GMSHPLUGIN.pyconf b/products/GMSHPLUGIN.pyconf index ddfe7f3..fa36b52 100644 --- a/products/GMSHPLUGIN.pyconf +++ b/products/GMSHPLUGIN.pyconf @@ -32,11 +32,6 @@ default : patches: [] } -default_win : -{ - patches : ['GMSHPLUGIN-BOS-18709.patch'] -} - version_8_1_0_to_9_1_0 : { name : "GMSHPLUGIN" diff --git a/products/llvm.pyconf b/products/llvm.pyconf index ded0adf..ac250ef 100644 --- a/products/llvm.pyconf +++ b/products/llvm.pyconf @@ -33,7 +33,7 @@ version_8_0_1_clang : { build_source : "script" compil_script: "llvm-8.0.1.sh" - patches : ['llvm-8.0.1-clang-FD32-gcc-10.0.patch'] + patches : ['llvm-8.0.1-clang-FD32-gcc-10.0.patch', 'llvm-8.0.1-clang-FD34-gcc-11.0.patch'] } version_8_0_1_clang_win : diff --git a/products/patches/llvm-8.0.1-clang-FD34-gcc-11.0.patch b/products/patches/llvm-8.0.1-clang-FD34-gcc-11.0.patch new file mode 100644 index 0000000..76e3147 --- /dev/null +++ b/products/patches/llvm-8.0.1-clang-FD34-gcc-11.0.patch @@ -0,0 +1,17 @@ +--- llvm-8.0.1_ref/utils/benchmark/src/benchmark_register.h 2022-04-11 13:40:41.292886023 +0200 ++++ llvm-8.0.1_new/utils/benchmark/src/benchmark_register.h 2022-04-11 13:45:57.661074020 +0200 +@@ -2,7 +2,13 @@ + #define BENCHMARK_REGISTER_H + + #include +- ++#ifdef __GNUC__ ++#include ++# if __GNUC_PREREQ(11,0) ++#include ++#include ++# endif ++#endif + #include "check.h" + + template -- 2.39.2