From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27666138350 for ; Thu, 9 Apr 2020 17:32:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4492CE0916; Thu, 9 Apr 2020 17:32:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F022E0916 for ; Thu, 9 Apr 2020 17:32:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C52B134F0C1 for ; Thu, 9 Apr 2020 17:32:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EEF3A1C8 for ; Thu, 9 Apr 2020 17:32:47 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1586453040.faaca2a472833c6acec812a3474d1bf811b3881b.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/qtwebengine-5.14.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.15.0_beta3.ebuild dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: faaca2a472833c6acec812a3474d1bf811b3881b X-VCS-Branch: master Date: Thu, 9 Apr 2020 17:32:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8eb08ce2-94e8-49eb-961f-2638e6db7148 X-Archives-Hash: f583ad4c07eb0bc46cd0eed196ad5f4d commit: faaca2a472833c6acec812a3474d1bf811b3881b Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 8 20:53:06 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 Apache.Org> Package-Manager: Portage-2.3.97, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner 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