commit: faaca2a472833c6acec812a3474d1bf811b3881b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Apr 8 20:53:06 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Apr 9 17:24:00 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=faaca2a4
dev-qt/qtwebengine: Pass appropriate options to ninja for GN Bug: https://bugs.gentoo.org/630834 Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Package-Manager: Portage-2.3.97, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild | 4 ++++ dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild | 4 ++++ dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 4 ++++ dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild index c2229351..06189a3f 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild @@ -85,6 +85,10 @@ src_prepare() { src/buildtools/config/common.pri || die fi + # bug 630834 - pass appropriate options to ninja when building GN + sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ + -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die + # bug 620444 - ensure local headers are used find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild index c468cea0..c06f87f2 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild @@ -85,6 +85,10 @@ src_prepare() { src/buildtools/config/common.pri || die fi + # bug 630834 - pass appropriate options to ninja when building GN + sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ + -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die + # bug 620444 - ensure local headers are used find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild index c468cea0..c06f87f2 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild @@ -85,6 +85,10 @@ src_prepare() { src/buildtools/config/common.pri || die fi + # bug 630834 - pass appropriate options to ninja when building GN + sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ + -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die + # bug 620444 - ensure local headers are used find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 7c6f51fc..1fca3af0 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -83,6 +83,10 @@ src_prepare() { src/core/config/common.pri || die fi + # bug 630834 - pass appropriate options to ninja when building GN + sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ + -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die + # bug 620444 - ensure local headers are used find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
