diff --git a/macros.qt6 b/macros.qt6 index f648bc2bc0ab5eaa38d2e5c7651a96e8c22422ff..7a91a3042e64ce65e9005877565c74c5d47de593 100644 --- a/macros.qt6 +++ b/macros.qt6 @@ -2,6 +2,7 @@ %_qt6_build_type RelWithDebInfo %_qt6_build_tool ninja +%_qt6_build_ld mold %_qt6_prefix %{_prefix} %_qt6_archdatadir %{_libdir}/qt6 @@ -32,7 +33,7 @@ %_qt6_cflags %{nil}@@QT6_CFLAGS@@ %_qt6_cxxflags %{nil}@@QT6_CXXFLAGS@@ -%_qt6_ldflags %{nil}%{?__global_ldflags} @@QT6_RPM_LD_FLAGS@@ +%_qt6_ldflags %{nil}%{?__global_ldflags} %{?_qt6_build_ld:-fuse-ld=%{_qt6_build_ld}} @@QT6_RPM_LD_FLAGS@@ %_qt6_optflags %{optflags} @@QT6_RPM_OPT_FLAGS@@ %_qt6_qmake_flags \\\ @@ -49,6 +50,7 @@ %qmake_qt6_wrapper @@QMAKE_QT6_WRAPPER@@ %cmake_qt6 \ + %{?_qt6_build_ld:export LDFLAGS="%{_qt6_ldflags}"; } \ %cmake -DCMAKE_BUILD_TYPE=%{_qt6_build_type} \\\ -DCMAKE_INSTALL_PREFIX=%{_qt6_prefix} \\\ %if "%_qt6_build_tool" == "ninja" \ diff --git a/qt6.spec b/qt6.spec index 2637137753fbee18e2af77626a96b5d218be1c08..ba7e2a0bd1dd84514a7a545db8edee96578ec72c 100644 --- a/qt6.spec +++ b/qt6.spec @@ -1,6 +1,6 @@ Name: qt6 Version: 6.8.2 -Release: 1 +Release: 2 Summary: Qt6 meta package License: GPL-3.0-only Source0: macros.qt6 @@ -82,6 +82,7 @@ Requires: qt6-rpm-macros %package rpm-macros Summary: RPM macros for building Qt6 and KDE Frameworks 5 packages Requires: cmake >= 3 +Requires: mold Requires: gcc-c++ Buildarch: noarch %description rpm-macros @@ -204,6 +205,9 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README %dir %{_datadir}/qt6/translations %changelog +* Fri Mar 21 2025 Funda Wang - 6.8.2-2 +- default to mold + * Fri Jan 31 2025 Funda Wang - 6.8.2-1 - update to 6.8.2 - auto-generate qt6qml() virtual provides