packages/qt5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redefine qmake binary depending on buildarch at runtime

Browse Source 
(cherry picked from commit 6f7af4666fc0d1473e5176f4a7cdc9a424b95601)
This commit is contained in:
Funda Wang 2024-11-28 12:47:15 +08:00 committed by openeuler-sync-bot
parent f93f3b42fb
commit f147259000
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
macros.qt5
View File

@ -11,7 +11,13 @@
%_qt5_libexecdir %{_qt5_archdatadir}/libexec %_qt5_libexecdir %{_qt5_archdatadir}/libexec
%_qt5_plugindir %{_qt5_archdatadir}/plugins %_qt5_plugindir %{_qt5_archdatadir}/plugins
%_qt5_qmldir %{_qt5_archdatadir}/qml %_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_settingsdir %{_sysconfdir}/xdg
%_qt5_sysconfdir %{_qt5_settingsdir} %_qt5_sysconfdir %{_qt5_settingsdir}
%_qt5_translationdir %{_datadir}/qt5/translations %_qt5_translationdir %{_datadir}/qt5/translations
@ -33,3 +39,6 @@
%qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags} %qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags}
%qmake_qt5_wrapper @@QMAKE_QT5_WRAPPER@@ %qmake_qt5_wrapper @@QMAKE_QT5_WRAPPER@@
%qmake_qt5_build %make_build
%qmake_qt5_install %make_install INSTALL_ROOT=%{?buildroot}

6
qt5.spec
View File

@ -1,6 +1,6 @@
Name: qt5 Name: qt5
Version: 5.15.10 Version: 5.15.10
Release: 4 Release: 5
Summary: Qt5 meta package Summary: Qt5 meta package
License: GPLv3 License: GPLv3
URL: https://getfedora.org/ URL: https://getfedora.org/
@ -60,7 +60,6 @@ sed -i \
-e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \ -e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \
-e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|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|@@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" \ -e "s|@@QMAKE_QT5_WRAPPER@@|%{_bindir}/qmake-qt5.sh|g" \
%{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5 %{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 %{_rpmconfigdir}/macros.d/macros.qt5-srpm
%changelog %changelog
* Thu Nov 28 2024 Funda Wang <fundawang@yeah.net> - 5.15.10-5
- Redefine qmake binary depending on buildarch at runtime
* Sun Apr 07 2024 liweigang <liweiganga@uniontech.com> - 5.15.10-4 * Sun Apr 07 2024 liweigang <liweiganga@uniontech.com> - 5.15.10-4
- add loongarch in macros qt5_qtwebengine_arches - add loongarch in macros qt5_qtwebengine_arches