commit: 7af3188a2035e98923dd1da81f2c74dbdc1f4739 Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> AuthorDate: Sun Dec 10 00:29:32 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Dec 10 01:42:54 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af3188a
dev-qt/qtwebengine: fix build on pax kernel Closes: https://bugs.gentoo.org/634220 Package-Manager: Portage-2.3.14, Repoman-2.3.6 .../qtwebengine-5.9.3-paxmark-mksnapshot.patch | 41 ++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild | 2 +- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch new file mode 100644 index 00000000000..ecedaf62f34 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch @@ -0,0 +1,41 @@ +Bug: https://bugs.gentoo.org/634220 + +--- a/src/3rdparty/chromium/v8/BUILD.gn ++++ b/src/3rdparty/chromium/v8/BUILD.gn +@@ -661,6 +661,7 @@ action("run_mksnapshot") { + + deps = [ + ":mksnapshot($v8_snapshot_toolchain)", ++ ":run_paxmark", + ] + + script = "tools/run.py" +@@ -706,6 +707,28 @@ action("run_mksnapshot") { + args += [ rebase_path(v8_embed_script, root_build_dir) ] + } + } ++action("run_paxmark") { ++ visibility = [ ":*" ] # Only targets in this file can depend on this. ++ ++ deps = [ ++ ":mksnapshot($v8_snapshot_toolchain)", ++ ] ++ ++ script = "/usr/sbin/pypaxctl" ++ ++ sources = [] ++ ++ outputs = [ ++ "$target_out_dir/mksnapshot", ++ ] ++ ++ args = [ ++ "-sm", ++ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", ++ "root_out_dir") + "/mksnapshot", ++ root_build_dir), ++ ] ++} + + action("run_mkpeephole") { + visibility = [ ":*" ] # Only targets in this file can depend on this. diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild index afb0d89df44..b0e35e0db27 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild @@ -76,7 +76,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" ) src_prepare() { - use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) + use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) # bug 620444 - ensure local headers are used find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
