From d99df8cad590674a7b5163a0bb7fc91164a3b944 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 28 Nov 2024 12:47:15 +0800 Subject: [PATCH] Redefine qmake binary depending on buildarch at runtime (cherry picked from commit 6f7af4666fc0d1473e5176f4a7cdc9a424b95601) --- macros.qt5 | 11 ++++++++++- qt5.spec | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/macros.qt5 b/macros.qt5 index ab4a483..4b1aa81 100644 --- a/macros.qt5 +++ b/macros.qt5 @@ -11,7 +11,13 @@ %_qt5_libexecdir %{_qt5_archdatadir}/libexec %_qt5_plugindir %{_qt5_archdatadir}/plugins %_qt5_qmldir %{_qt5_archdatadir}/qml -%_qt5_qmake @@QMAKE@@ +%_qt5_qmake \\\ +%ifarch noarch \ +%{_bindir}/qmake-qt5 \\\ +%else \ +%{_prefix}/%{_lib}/qt5/bin/qmake \\\ +%endif \ +%{nil} %_qt5_settingsdir %{_sysconfdir}/xdg %_qt5_sysconfdir %{_qt5_settingsdir} %_qt5_translationdir %{_datadir}/qt5/translations @@ -33,3 +39,6 @@ %qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags} %qmake_qt5_wrapper @@QMAKE_QT5_WRAPPER@@ + +%qmake_qt5_build %make_build +%qmake_qt5_install %make_install INSTALL_ROOT=%{?buildroot} diff --git a/qt5.spec b/qt5.spec index 5b78ead..5349176 100644 --- a/qt5.spec +++ b/qt5.spec @@ -1,6 +1,6 @@ Name: qt5 Version: 5.15.10 -Release: 4 +Release: 5 Summary: Qt5 meta package License: GPLv3 URL: https://getfedora.org/ @@ -60,7 +60,6 @@ sed -i \ -e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \ -e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|g" \ -e "s|@@QT5_RPM_OPT_FLAGS@@|%{?qt5_rpm_opt_flags}|g" \ - -e "s|@@QMAKE@@|%{_prefix}/%%{_lib}/qt5/bin/qmake|g" \ -e "s|@@QMAKE_QT5_WRAPPER@@|%{_bindir}/qmake-qt5.sh|g" \ %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5 @@ -94,6 +93,9 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README %{_rpmconfigdir}/macros.d/macros.qt5-srpm %changelog +* Thu Nov 28 2024 Funda Wang - 5.15.10-5 +- Redefine qmake binary depending on buildarch at runtime + * Sun Apr 07 2024 liweigang - 5.15.10-4 - add loongarch in macros qt5_qtwebengine_arches -- Gitee