Gentoo Archives: gentoo-commits

From: Jimi Huotari <chiitoo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
Date: Thu, 24 Jun 2021 11:19:41
Message-Id: 1624533100.45d7908ab622bc74093f309340a1d637b84a0951.chiitoo@gentoo
1 commit: 45d7908ab622bc74093f309340a1d637b84a0951
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 24 11:10:34 2021 +0000
4 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 24 11:11:40 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=45d7908a
7
8 dev-qt/qtwebengine: remove "pass appropriate options to ninja"
9
10 The file 'bootstrap.py' has changed, and this 'sed' has been doing
11 nothing since around 83-based. Quick testing suggests that NINJAFLAGS
12 is being respected as it should be, even without our modifications.
13
14 Package-Manager: Portage-3.0.20, Repoman-3.0.3
15 Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
16
17 dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 4 ----
18 1 file changed, 4 deletions(-)
19
20 diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
21 index 6b75547b..c5be9e25 100644
22 --- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
23 +++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild
24 @@ -115,10 +115,6 @@ src_prepare() {
25 src/buildtools/config/common.pri || die
26 fi
27
28 - # bug 630834 - pass appropriate options to ninja when building GN
29 - sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
30 - -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
31 -
32 # bug 620444 - ensure local headers are used
33 find "${S}" -type f -name "*.pr[fio]" | \
34 xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die