From 4c4708a7592169647a76baef99cc77983419ddee Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Thu, 23 Feb 2023 20:15:25 -0500
Subject: [PATCH] 15.0.7 Release

Resolves: rhbz#2178800
---
 .gitignore       |  4 ++++
 llvm-compat.spec | 52 ++++++++++++++++++------------------------------
 sources          |  5 +++--
 3 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index ac59c28..6901067 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,7 @@ SOURCES/clang-14.0.6.src.tar.xz
 SOURCES/llvm-14.0.6.src.tar.xz
 /clang-14.0.6.src.tar.xz
 /llvm-14.0.6.src.tar.xz
+/llvm-15.0.7.src.tar.xz
+/clang-15.0.7.src.tar.xz
+/cmake-16.0.0.src.tar.xz
+/cmake-15.0.7.src.tar.xz
diff --git a/llvm-compat.spec b/llvm-compat.spec
index c91f9c2..dce47e1 100644
--- a/llvm-compat.spec
+++ b/llvm-compat.spec
@@ -1,6 +1,6 @@
-%global maj_ver 14
+%global maj_ver 15
 %global min_ver 0
-%global patch_ver 6
+%global patch_ver 7
 %global baserelease 1
 
 # Limit build jobs on ppc64 systems to avoid running out of memory.
@@ -24,6 +24,7 @@ License:	NCSA
 URL:		http://llvm.org
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/llvm-%{version}.src.tar.xz
 Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/clang-%{version}.src.tar.xz
+Source2:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/cmake-%{version}.src.tar.xz
 
 # LLVM Patches:
 
@@ -68,8 +69,14 @@ Obsoletes:	llvm-libs = %{version}
 Shared libraries for the LLVM compiler infrastructure.
 
 %prep
+%setup -T -q -b 2 -n cmake-%{version}.src
+cd ..
+mv cmake-%{version}.src cmake
+
 %setup -T -q -b 1 -n clang-%{version}.src
 %autopatch -m100 -p1
+cd ..
+mv clang-%{version}.src clang
 
 %setup -q -n llvm-%{version}.src
 %autopatch -M100 -p2
@@ -110,52 +117,24 @@ pushd llvm-build
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DLLVM_INCLUDE_TESTS=OFF \
 	-DLLVM_INCLUDE_BENCHMARKS=OFF \
+	-DLLVM_ENABLE_PROJECTS="clang"  \
 	-DCMAKE_INSTALL_PREFIX=%{install_prefix}
 
 
-DESTDIR=%{buildroot} %__ninja %__ninja_common_opts -l 8 LLVM llvm-config
+DESTDIR=%{buildroot} %__ninja %__ninja_common_opts
 
 popd
 
-mkdir clang-build
-pushd clang-build
-
-%cmake -G Ninja ../clang-%{version}.src \
-	-DLLVM_CONFIG=../llvm-build/bin/llvm-config \
-        -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-        -DCLANG_ENABLE_ARCMT:BOOL=ON \
-        -DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \
-        -DCLANG_PLUGIN_SUPPORT:BOOL=ON \
-        -DENABLE_LINKER_BUILD_ID:BOOL=ON \
-        -DLLVM_ENABLE_EH=ON \
-	    -DBUILD_SHARED_LIBS=OFF \
-        -DLLVM_ENABLE_RTTI=ON \
-	    -DLLVM_INCLUDE_TESTS=OFF \
-	    -DCMAKE_SKIP_RPATH:BOOL=ON \
-        -DLIB_SUFFIX= \
-	-DCMAKE_INSTALL_PREFIX=%{install_prefix}
-
-export DESTDIR=%{buildroot}
-%__ninja help | grep 'libclang[a-zA-Z0-9]*.so' | cut -d ':' -f 1 | xargs %__ninja %__ninja_common_opts -l 8
-# I have not been able to build libclang-cpp.so on i686.
-%ifnarch %ix86
-%__ninja help | grep 'libclang-cpp[a-zA-Z0-9]*.so' | cut -d ':' -f 1 | xargs %__ninja %__ninja_common_opts -l 8
-%endif
-unset DESTDIR
-
 # Remove all static archives to avoid running out of disk space on aarch64.
 find . -iname '*.a' -delete
 
-popd
-
 %install
 cd ..
 
 DESTDIR=%{buildroot} %__ninja %__ninja_common_opts -l 8 install-LLVM -C llvm-build
 
 mkdir -p %{buildroot}%{pkg_libdir}
-install clang-build/lib/*.so.* %{buildroot}%{pkg_libdir}
+install llvm-build/lib/*.so.* %{buildroot}%{pkg_libdir}
 
 # Create ld.so.conf.d entry
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
@@ -163,6 +142,10 @@ cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF
 %{pkg_libdir}
 EOF
 
+for f in libLTO.so libRemarks.so; do
+  rm -Rf %{buildroot}%{pkg_libdir}/$f.%{maj_ver}
+done
+
 %check
 
 %post libs -p /sbin/ldconfig
@@ -179,6 +162,9 @@ EOF
 %endif
 
 %changelog
+* Fri Apr 28 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-1
+- 15.0.7 Release
+
 * Tue Oct 18 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-1
 - 14.0.6 Release
 
diff --git a/sources b/sources
index c2cdd77..f193708 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-SHA512 (clang-14.0.6.src.tar.xz) = 5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b
-SHA512 (llvm-14.0.6.src.tar.xz) = 6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d
+SHA512 (clang-15.0.7.src.tar.xz) = 9fd2736a9f5993ddbb5b3c507fe497234a6def64f6f418f379d1ca56c9c361ad1ae9a5445ab938230fbc1671ec00b4f802a412b048569023863c20dc6bb46a1f
+SHA512 (llvm-15.0.7.src.tar.xz) = ed8d565515b1bc6164e4ff06d3388ba92e332850305496fd65db9adf1ec87bd9dd1bfde49dd41be5d5216289efc72bfd287cd7392f2bba80b740d4c314c749e5
+SHA512 (cmake-15.0.7.src.tar.xz) = 85097a6eaee0df004567905f7e5ce8ca02e3b46c6fc66fa552fe99734642e6ee61685de4e5e6e8b505963334d7b91d98ecd9c5870e6bdd3f0018ee5b963ffa96