From 0ea37a39ebe064cfd099fe49ae539594397f8022 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Thu, 12 May 2022 12:43:49 +0200 Subject: [PATCH] basic qt macros (2.016) provide %{qmake_qt5} macro which respects %__cc, %__cxx and %rpm*flags instead of using those used during build of qt5-qtbase --- macros.qt | 11 +++++++++++ rpm-pld-macros.spec | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 macros.qt diff --git a/macros.qt b/macros.qt new file mode 100644 index 0000000..278cdb2 --- /dev/null +++ b/macros.qt @@ -0,0 +1,11 @@ +%_qt5_qmake /usr/bin/qmake-qt5 +%qmake_qt5 %{_qt5_qmake} \\\ + %{?__cc:QMAKE_CC="%{__cc}"} \\\ + %{?__cxx:QMAKE_CXX="%{__cxx}"} \\\ + QMAKE_CFLAGS_RELEASE="${CFLAGS:-%rpmcflags %rpmcppflags}" \\\ + QMAKE_CFLAGS_DEBUG="${CFLAGS:-%rpmcflags %rpmcppflags}" \\\ + QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%rpmcxxflags %rpmcppflags}" \\\ + QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%rpmcxxflags %rpmcppflags}" \\\ + QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%rpmldflags}" \\\ + QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%rpmldflags}" \\\ +%{nil} diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec index 814e2bb..3ae7d04 100644 --- a/rpm-pld-macros.spec +++ b/rpm-pld-macros.spec @@ -1,4 +1,4 @@ -%define rpm_macros_rev 2.015 +%define rpm_macros_rev 2.016 %define find_lang_rev 1.40 # split into individual X_prov_ver if there is a reason to desync %define prov_ver 4.15 @@ -52,6 +52,7 @@ Source54: macros.selinux Source55: macros.rust Source56: macros.arch Source57: macros.go +Source58: macros.qt Source60: macros.gstreamer Source61: attr.gstreamer @@ -237,6 +238,7 @@ cp -p %{SOURCE54} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.selinux cp -p %{SOURCE55} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.rust cp -p %{SOURCE56} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.arch cp -p %{SOURCE57} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.go +cp -p %{SOURCE58} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.qt cp -p %{SOURCE60} $RPM_BUILD_ROOT%{_usrlibrpm}/macros.d/macros.gstreamer cp -p %{SOURCE61} $RPM_BUILD_ROOT%{_usrlibrpm}/fileattrs/gstreamer.attr @@ -273,6 +275,7 @@ rm -rf $RPM_BUILD_ROOT %{_usrlibrpm}/macros.d/macros.perl %{_usrlibrpm}/macros.d/macros.php %{_usrlibrpm}/macros.d/macros.python +%{_usrlibrpm}/macros.d/macros.qt %{_usrlibrpm}/macros.d/macros.ruby %{_usrlibrpm}/macros.d/macros.rust %{_usrlibrpm}/macros.d/macros.selinux -- 2.44.0