From: Jan Rękorajski Date: Wed, 27 Jul 2022 20:05:07 +0000 (+0200) Subject: - 2.018, add qt6 macros X-Git-Tag: auto/th/rpm-pld-macros-2.018-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-pld-macros.git;a=commitdiff_plain;h=1b6d43a - 2.018, add qt6 macros --- diff --git a/macros.qt b/macros.qt index 278cdb2..bc6b347 100644 --- a/macros.qt +++ b/macros.qt @@ -9,3 +9,15 @@ QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%rpmldflags}" \\\ QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%rpmldflags}" \\\ %{nil} + +%_qt6_qmake /usr/bin/qmake-qt6 +%qmake_qt6 %{_qt6_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 1c63bc1..f2c8204 100644 --- a/rpm-pld-macros.spec +++ b/rpm-pld-macros.spec @@ -1,4 +1,4 @@ -%define rpm_macros_rev 2.017 +%define rpm_macros_rev 2.018 %define find_lang_rev 1.40 # split into individual X_prov_ver if there is a reason to desync %define prov_ver 4.15