diff --git a/0001-Use-system-compatible-include-path-for-xxhash.h.patch b/0001-Use-system-compatible-include-path-for-xxhash.h.patch index dd228c5..ca0604b 100644 --- a/0001-Use-system-compatible-include-path-for-xxhash.h.patch +++ b/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 -+++ b/common/common.h +--- a/lib/common.h ++++ b/lib/common.h @@ -34,7 +34,7 @@ #endif diff --git a/mold-2.33.0.tar.gz b/mold-2.34.1.tar.gz similarity index 56% rename from mold-2.33.0.tar.gz rename to mold-2.34.1.tar.gz index 58f0922..3b382c7 100644 Binary files a/mold-2.33.0.tar.gz and b/mold-2.34.1.tar.gz differ diff --git a/mold.spec b/mold.spec index 4978956..8acb4fa 100644 --- a/mold.spec +++ b/mold.spec @@ -1,14 +1,14 @@ %bcond_with ctest Name: mold -Version: 2.33.0 +Version: 2.34.1 Release: 1 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 loongarch64 +ExclusiveArch: %{ix86} x86_64 aarch64 riscv64 loongarch64 BuildRequires: gcc gcc-c++ >= 10 BuildRequires: python3 grep cmake openssl-devel BuildRequires: zlib-devel xxhash-devel libzstd libzstd-devel @@ -26,7 +26,7 @@ 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_SYSTEM_TBB=ON +%define build_args -DMOLD_USE_MIMALLOC=OFF -DMOLD_USE_SYSTEM_TBB=ON -DMOLD_LTO=ON %description mold is a faster drop-in replacement for existing Unix linkers. @@ -40,20 +40,16 @@ build time, especially in rapid debug-edit-rebuild cycles. rm -r third-party/{xxhash,zlib,zstd} %build -%set_build_flags -mkdir "%{_vpath_builddir}" -%cmake -B "%{_vpath_builddir}" %{build_args} -/usr/bin/cmake --build "%{_vpath_builddir}" "%{?_smp_mflags}" --verbose +%cmake -B %{_vpath_builddir} %{build_args} +%cmake_build -%check %if %{with ctest} -pushd "%{_vpath_builddir}" -/usr/bin/ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} || true -popd +%check +%ctest %endif %install -DESTDIR="%{buildroot}" /usr/bin/cmake --install "%{_vpath_builddir}" +%cmake_install chmod +x %{buildroot}%{_libdir}/mold/mold-wrapper.so %files @@ -61,13 +57,17 @@ 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 +* Sat Oct 05 2024 Funda Wang - 2.34.1-1 +- Upgrade to 2.34.1 + * Tue Aug 13 2024 jchzhou - 2.33.0-1 - Upgrade to 2.33.0 @@ -75,4 +75,4 @@ chmod +x %{buildroot}%{_libdir}/mold/mold-wrapper.so - Upgrade to 2.32.1 * Tue Mar 19 2024 jchzhou - 2.30.0-1 -- Init package \ No newline at end of file +- Init package diff --git a/mold.yaml b/mold.yaml new file mode 100644 index 0000000..0f130f3 --- /dev/null +++ b/mold.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: ui314/mold +tag_prefix: ^v +separator: .