From dc19dcad4e22272590f3c4af256fdee35eed6285 Mon Sep 17 00:00:00 2001
From: liyunfei <liyunfei33@huawei.com>
Date: Tue, 21 Oct 2025 11:07:36 +0800
Subject: [PATCH] fix 22.03 build & update target triples for all openEuler
 based distribution

---
 0004-remove-cmake_minimum_required.patch |  2 +-
 llvm-toolset-17.spec                     | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/0004-remove-cmake_minimum_required.patch b/0004-remove-cmake_minimum_required.patch
index 4c6a706..2caaf26 100644
--- a/0004-remove-cmake_minimum_required.patch
+++ b/0004-remove-cmake_minimum_required.patch
@@ -40,9 +40,9 @@ index 8472ce00b413..3ddfd2b1743b 100644
 @@ -1,4 +1,4 @@
 -cmake_minimum_required(VERSION 3.20.0)
 +cmake_minimum_required(VERSION 3.16.0)
+ include(CheckCXXCompilerFlag)
  include(CheckIncludeFiles)
  include(GNUInstallDirs)
- 
 diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
 index 98fcb6ea1a07..18936e79a24c 100644
 --- a/clang/CMakeLists.txt
diff --git a/llvm-toolset-17.spec b/llvm-toolset-17.spec
index 3f64e76..8797e56 100644
--- a/llvm-toolset-17.spec
+++ b/llvm-toolset-17.spec
@@ -4,7 +4,12 @@
 %global min_ver 0
 %global patch_ver 6
 
-%global os_version %{lua: print(tonumber(rpm.expand("%{dist}"):match("oe(%d+)") or 9999))}
+%global os_version %{lua: print(tonumber(rpm.expand("%{dist}"):match("oe(%d+)") or 2203))}
+
+# workaround for `dist` of oE master branch changing to .oe1
+%if %{os_version} == 1
+%global os_version 9999
+%endif
 
 # Build sys_llvm packages or compat packages
 %bcond_with sys_llvm
@@ -146,7 +151,7 @@
 #region main package
 Name:		llvm-toolset-%{maj_ver}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}
-Release:	11
+Release:	12
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
@@ -741,6 +746,11 @@ Documentation for LLVM libunwind
 
 # shebang_fix part removed
 
+# update Gnu target triples, make it friendly to all openEuler based distribution
+%if "%{_vendor}" != "openEuler"
+sed -i 's/"\([a-zA-Z0-9_-]\+\)-openEuler-linux"/"\1-openEuler-linux", "\1-%{_vendor}-linux"/g' %{build_src_dir}/clang/lib/Driver/ToolChains/Gnu.cpp
+%endif
+
 #endregion prep
 
 #region build
@@ -2773,6 +2783,9 @@ fi
 #endregion files
 
 %changelog
+* Tue Oct 21 2025 liyunfei <liyunfei33@huawei.com> - 17.0.6-12
+- fix 22.03 build & update target triples for all openEuler based distribution
+
 * Fri Oct 17 2025 liyunfei <liyunfei33@huawei.com> - 17.0.6-11
 - update to llvm-for-oe-17.0.6-2509.0.2
 - release-note https://gitee.com/openeuler/llvm-project/releases/tag/llvm-for-oE-17.0.6-2509.0.2
-- 
Gitee