!10 Switch to bundled oneTBB for 24.03 series

From: @jchzhou 
Reviewed-by: @Jingwiw 
Signed-off-by: @Jingwiw

0001-Use-system-compatible-include-path-for-xxhash.h.patch

@@ -10,7 +10,7 @@ not in an `xxhash` subdirectory. Adjust the include path and the
 `#include` directive accordingly.
 ---
  CMakeLists.txt  | 2 ++
- common/common.h | 2 +-
+ lib/common.h | 2 +-
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,10 +26,10 @@ index c6d00990..82f338f9 100644
  # We always use Clang to build mold on Windows. MSVC can't compile mold.
  if(WIN32)
    if(MSVC AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-diff --git a/common/common.h b/common/common.h
+diff --git a/lib/common.h b/lib/common.h
 index b7e002a6..5ddc9213 100644
---- a/common/common.h
+--- a/lib/common.h
-+++ b/common/common.h
++++ b/lib/common.h
 @@ -34,7 +34,7 @@
  #endif
  

0002-build-blake3-as-static.patch

@@ -1,9 +1,9 @@
 Src: https://build.opensuse.org/request/show/1118582
 By Martin Liška <martin.liska@hey.com>
 
-From 3b14fbc71c42b312f77ac4612b28b3e20462e02b Mon Sep 17 00:00:00 2001
+From a1e10884ddc6468448f9337c106008cb2e7ba10a Mon Sep 17 00:00:00 2001
 From: jchzhou <zhoujiacheng@iscas.ac.cn>
-Date: Tue, 19 Mar 2024 17:14:37 +0800
+Date: Wed, 17 Jul 2024 17:34:43 +0800
 Subject: [PATCH] build blake3 as static
 
 Signed-off-by: jchzhou <zhoujiacheng@iscas.ac.cn>
@@ -12,11 +12,11 @@ Signed-off-by: jchzhou <zhoujiacheng@iscas.ac.cn>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/third-party/blake3/c/CMakeLists.txt b/third-party/blake3/c/CMakeLists.txt
-index 3190eff..3e8c763 100644
+index 3a3b232..6550bbc 100644
 --- a/third-party/blake3/c/CMakeLists.txt
 +++ b/third-party/blake3/c/CMakeLists.txt
-@@ -32,7 +32,7 @@ set(BLAKE3_X86_NAMES i686 x86 X86)
+@@ -42,7 +42,7 @@ elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU"
- set(BLAKE3_ARMv8_NAMES aarch64 AArch64 arm64 ARM64 armv8 armv8a)
+ endif()
  
  # library target
 -add_library(blake3
@@ -25,5 +25,5 @@ index 3190eff..3e8c763 100644
    blake3_dispatch.c
    blake3_portable.c
 -- 
-2.44.0
+2.45.2
 

mold.spec

@@ -1,38 +1,26 @@
 %bcond_with ctest
 
 Name:           mold
-Version:        2.30.0
+Version:        2.34.1
-Release:        1
+Release:        2
 Summary:        A Modern Linker (mold)
 License:        MIT
 URL:            https://github.com/rui314/mold
 Source:         https://github.com/rui314/mold/archive/v%{version}/%{name}-%{version}.tar.gz
 
-ExclusiveArch:  x86_64 aarch64 riscv64
+ExclusiveArch:  %{ix86} x86_64 aarch64 riscv64 loongarch64
-BuildRequires:  cmake
+BuildRequires:  gcc gcc-c++ >= 10
-BuildRequires:  gcc
+BuildRequires:  python3 grep cmake openssl-devel
-BuildRequires:  gcc-c++ >= 10
+BuildRequires:  zlib-devel xxhash-devel libzstd libzstd-devel
-BuildRequires:  openssl-devel
-BuildRequires:  grep
-BuildRequires:  python3
-BuildRequires:  xxhash-devel
-BuildRequires:  zlib-devel
-BuildRequires:  libzstd
-BuildRequires:  libzstd-devel
-
-# Required by bundled oneTBB
-BuildRequires:	hwloc-devel
 
 # following pkgs are only required for the test
-BuildRequires:  clang
+BuildRequires:  llvm clang perl
-BuildRequires:  gdb
+BuildRequires:  gdb glibc-devel
-BuildRequires:  glibc-devel
+BuildRequires:  libstdc++-static libdwarf-tools
-BuildRequires:  libstdc++-static
+
-BuildRequires:  libdwarf-tools
+# BuildRequires:  tbb-devel >= 2021.11
-BuildRequires:  llvm
+Provides:       bundled(tbb) = 2021.13
-BuildRequires:  perl
+BuildRequires:  hwloc-devel
-# API-incompatible with older tbb 2020.3 currently shipped by openEuler
-Provides:   bundled(tbb) = 2021.11
 
 # Allow building against the system-provided `xxhash.h`
 Patch0:     0001-Use-system-compatible-include-path-for-xxhash.h.patch
@@ -40,7 +28,8 @@ Patch0:     0001-Use-system-compatible-include-path-for-xxhash.h.patch
 # Build blake3 as static
 Patch1:     0002-build-blake3-as-static.patch
 
-%define build_args -DMOLD_USE_MIMALLOC=OFF -DMOLD_USE_MIMALLOC=OFF
+# %define build_args -DMOLD_USE_MIMALLOC=OFF -DMOLD_USE_SYSTEM_TBB=ON -DMOLD_LTO=ON
+%define build_args -DMOLD_USE_MIMALLOC=OFF -DMOLD_LTO=ON
 
 %description
 mold is a faster drop-in replacement for existing Unix linkers.
@@ -54,20 +43,16 @@ build time, especially in rapid debug-edit-rebuild cycles.
 rm -r third-party/{xxhash,zlib,zstd}
 
 %build
-%set_build_flags
+%cmake -B %{_vpath_builddir} %{build_args}
-mkdir "%{_vpath_builddir}"
+%cmake_build
-%cmake -B "%{_vpath_builddir}" %{build_args}
-/usr/bin/cmake --build "%{_vpath_builddir}" "%{?_smp_mflags}" --verbose
 
-%check
 %if %{with ctest}
-pushd "%{_vpath_builddir}"
+%check
-/usr/bin/ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} || true
+%ctest
-popd
 %endif
 
 %install
-DESTDIR="%{buildroot}" /usr/bin/cmake --install "%{_vpath_builddir}"
+%cmake_install
 chmod +x %{buildroot}%{_libdir}/mold/mold-wrapper.so
 
 %files
@@ -75,12 +60,25 @@ chmod +x %{buildroot}%{_libdir}/mold/mold-wrapper.so
 %license %{_docdir}/mold/LICENSE.third-party
 %{_bindir}/mold
 %{_bindir}/ld.mold
+%dir %{_libdir}/mold
 %{_libdir}/mold/mold-wrapper.so
-%{_libexecdir}/mold
+%dir %{_libexecdir}/mold
 %{_libexecdir}/mold/ld
 %{_mandir}/man1/ld.mold.1*
 %{_mandir}/man1/mold.1*
 
 %changelog
+* Wed Nov 06 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 2.34.1-2
+- Switch to bundled onetbb for 24.03 series
+
+* Sat Oct 05 2024 Funda Wang <fundawang@yeah.net> - 2.34.1-1
+- Upgrade to 2.34.1
+
+* Tue Aug 13 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 2.33.0-1
+- Upgrade to 2.33.0
+
+* Wed Jul 17 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 2.32.1-1
+- Upgrade to 2.32.1
+
 * Tue Mar 19 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 2.30.0-1
 - Init package

mold.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo: rui314/mold
+tag_prefix: ^v
+separator: .