From 261fc73d962ac16a4941a307774dc1af60142f74 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Wed, 20 Nov 2024 11:50:14 +0800
Subject: [PATCH] adopt to new cmake macro

---
 clang.spec | 25 +++++++++++--------------
 clang.yaml |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/clang.spec b/clang.spec
index a6a7c96..96adb94 100644
--- a/clang.spec
+++ b/clang.spec
@@ -1,3 +1,4 @@
+%undefine __cmake_in_source_build
 %bcond_without sys_llvm
 %bcond_without check
 %bcond_with classic_flang
@@ -43,9 +44,8 @@
 
 Name:		%{pkg_name}
 Version:	%{clang_version}
-Release:	29
+Release:	30
 Summary:	A C language family front-end for LLVM
-
 License:	NCSA
 URL:		http://llvm.org
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}/%{clang_srcdir}.tar.xz
@@ -240,9 +240,7 @@ pathfix.py -i %{__python3} -pn \
 	tools/scan-build-py/libexec/*
 
 %build
-mkdir -p _build
-cd _build
-%cmake .. -G Ninja \
+%cmake -G Ninja \
 	-DCLANG_DEFAULT_PIE_ON_LINUX=ON \
 	-DLLVM_PARALLEL_LINK_JOBS=%{max_link_jobs} \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
@@ -273,12 +271,8 @@ cd _build
 	-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
 	-DBUILD_SHARED_LIBS=OFF \
 	-DCLANG_REPOSITORY_STRING="%{?distro} %{version}-%{release}" \
-	-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../../%{clang_tools_srcdir} \
-%if 0%{?__isa_bits} == 64
-	-DCLANG_RESOURCE_DIR=../lib64/clang/%{maj_ver} \
-%else
-	-DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \
-%endif
+	-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=%{_vpath_srcdir}/../%{clang_tools_srcdir} \
+	-DCLANG_RESOURCE_DIR=../%{_lib}/clang/%{maj_ver} \
 %if 0%{?__isa_bits} == 64
 	-DLLVM_LIBDIR_SUFFIX=64 \
 %else
@@ -297,11 +291,11 @@ cd _build
 %endif
 	-DCLANG_DEFAULT_UNWINDLIB=libgcc
 
-%ninja_build
+%cmake_build
 
 %install
 
-%ninja_install -C _build
+%cmake_install
 mkdir -p %{buildroot}/%{_bindir}
 
 rm -vf %{buildroot}%{_datadir}/clang/clang-format-bbedit.applescript
@@ -320,7 +314,7 @@ mkdir -p %{buildroot}%{install_libdir}/clang/%{maj_ver}/{bin,include,lib,share}/
 %check
 %if %{with check}
 
-LD_LIBRARY_PATH=%{buildroot}/%{install_libdir}  %{__ninja} check-all -C ./_build/
+LD_LIBRARY_PATH=%{buildroot}/%{install_libdir}  %{__ninja} check-all -C %{__cmake_builddir}
 %endif
 
 %files
@@ -421,6 +415,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{install_libdir}  %{__ninja} check-all -C ./_build
 %{install_bindir}/git-clang-format
 
 %changelog
+* Wed Nov 20 2024 Funda Wang <fundawang@yeah.net> - 17.0.6-30
+- adopt to new cmake macro
+
 * Wed Nov 20 2024 eastb233 <xiezhiheng@huawei.com> - 17.0.6-29
 - [clang] Increase the number of driver diagnostics
 
diff --git a/clang.yaml b/clang.yaml
index 7d98bd8..c7c50f6 100644
--- a/clang.yaml
+++ b/clang.yaml
@@ -1,4 +1,4 @@
 version_control: github
 src_repo: llvm/llvm-project
 tag_prefix: ^llvmorg-
-seperator: .
+separator: .
-- 
Gitee