diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2017-10-10 11:23:33 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2017-10-10 11:23:33 +0000 |
| commit | 95923324185a8fe2175f801a93150829933f5f0e (patch) | |
| tree | 63d731c8758b768704478a7e6c106140e1ea6f9e | |
| parent | 2017-10-10 10:44:01 UTC (diff) | |
| parent | qt5-build.eclass: unset variables that, if set, cause configure to fail (diff) | |
| download | gentoo-95923324185a8fe2175f801a93150829933f5f0e.tar.gz gentoo-95923324185a8fe2175f801a93150829933f5f0e.tar.bz2 gentoo-95923324185a8fe2175f801a93150829933f5f0e.zip | |
Merge updates from master
| -rw-r--r-- | dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.2.ebuild | 2 | ||||
| -rw-r--r-- | eclass/qt5-build.eclass | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild index 2cbcca31ea53..852cb2cb27d1 100644 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.7.1.ebuild @@ -7,7 +7,7 @@ inherit qt5-build DESCRIPTION="Virtual keyboard plugin for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~x86" fi # TODO: unbudle libraries for more layouts diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.2.ebuild index 2cbcca31ea53..852cb2cb27d1 100644 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.2.ebuild +++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.2.ebuild @@ -7,7 +7,7 @@ inherit qt5-build DESCRIPTION="Virtual keyboard plugin for the Qt5 framework" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~x86" fi # TODO: unbudle libraries for more layouts diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index d933767b4a52..76dfc9b425ae 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -519,6 +519,11 @@ qt5_base_configure() { tc-export AR CC CXX OBJDUMP RANLIB STRIP export LD="$(tc-getCXX)" + # bug 633838 + if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then + unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES + fi + # configure arguments local conf=( # installation paths |