commit: 598ef1e2bb0fb3c13c58dfa4abff3869ff7534b9 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> AuthorDate: Sun Oct 16 13:23:40 2022 +0000 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> CommitDate: Sun Oct 16 13:35:17 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=598ef1e2
dev-qt/qtbase: add 'dosym' for 'qmake' Also sort some of the configure variables. Bug: https://bugs.gentoo.org/863395 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> dev-qt/qtbase/qtbase-6.4.0.ebuild | 21 ++++++++++++++------- dev-qt/qtbase/qtbase-6.4.9999.ebuild | 21 ++++++++++++++------- dev-qt/qtbase/qtbase-6.9999.ebuild | 21 ++++++++++++++------- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/dev-qt/qtbase/qtbase-6.4.0.ebuild b/dev-qt/qtbase/qtbase-6.4.0.ebuild index b8c13642..7139d94a 100644 --- a/dev-qt/qtbase/qtbase-6.4.0.ebuild +++ b/dev-qt/qtbase/qtbase-6.4.0.ebuild @@ -104,19 +104,19 @@ RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( + -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR} -DINSTALL_BINDIR=${QT6_BINDIR} + -DINSTALL_DATADIR=${QT6_DATADIR} + -DINSTALL_DOCDIR=${QT6_DOCDIR} + -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR} -DINSTALL_LIBDIR=${QT6_LIBDIR} - -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR} - -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR} -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR} + -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs + -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR} -DINSTALL_QMLDIR=${QT6_QMLDIR} - -DINSTALL_DATADIR=${QT6_DATADIR} - -DINSTALL_DOCDIR=${QT6_DOCDIR} - -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR} -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR} - -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs - -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} + -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR} -DQT_FEATURE_androiddeployqt=OFF $(qt_feature concurrent) $(qt_feature dbus) @@ -176,3 +176,10 @@ src_configure() { qt6-build_src_configure } + +src_install() { + qt6-build_src_install + + # https://bugs.gentoo.org/863395 + dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6 +} diff --git a/dev-qt/qtbase/qtbase-6.4.9999.ebuild b/dev-qt/qtbase/qtbase-6.4.9999.ebuild index b8c13642..7139d94a 100644 --- a/dev-qt/qtbase/qtbase-6.4.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.4.9999.ebuild @@ -104,19 +104,19 @@ RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( + -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR} -DINSTALL_BINDIR=${QT6_BINDIR} + -DINSTALL_DATADIR=${QT6_DATADIR} + -DINSTALL_DOCDIR=${QT6_DOCDIR} + -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR} -DINSTALL_LIBDIR=${QT6_LIBDIR} - -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR} - -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR} -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR} + -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs + -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR} -DINSTALL_QMLDIR=${QT6_QMLDIR} - -DINSTALL_DATADIR=${QT6_DATADIR} - -DINSTALL_DOCDIR=${QT6_DOCDIR} - -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR} -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR} - -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs - -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} + -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR} -DQT_FEATURE_androiddeployqt=OFF $(qt_feature concurrent) $(qt_feature dbus) @@ -176,3 +176,10 @@ src_configure() { qt6-build_src_configure } + +src_install() { + qt6-build_src_install + + # https://bugs.gentoo.org/863395 + dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6 +} diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index b8c13642..7139d94a 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -104,19 +104,19 @@ RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( + -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR} -DINSTALL_BINDIR=${QT6_BINDIR} + -DINSTALL_DATADIR=${QT6_DATADIR} + -DINSTALL_DOCDIR=${QT6_DOCDIR} + -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} -DINSTALL_INCLUDEDIR=${QT6_HEADERDIR} -DINSTALL_LIBDIR=${QT6_LIBDIR} - -DINSTALL_ARCHDATADIR=${QT6_ARCHDATADIR} - -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR} -DINSTALL_LIBEXECDIR=${QT6_LIBEXECDIR} + -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs + -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR} -DINSTALL_QMLDIR=${QT6_QMLDIR} - -DINSTALL_DATADIR=${QT6_DATADIR} - -DINSTALL_DOCDIR=${QT6_DOCDIR} - -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR} -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR} - -DINSTALL_MKSPECSDIR=${QT6_ARCHDATADIR}/mkspecs - -DINSTALL_EXAMPLESDIR=${QT6_EXAMPLESDIR} + -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR} -DQT_FEATURE_androiddeployqt=OFF $(qt_feature concurrent) $(qt_feature dbus) @@ -176,3 +176,10 @@ src_configure() { qt6-build_src_configure } + +src_install() { + qt6-build_src_install + + # https://bugs.gentoo.org/863395 + dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6 +}
