| 1 |
commit: 299d80e3980c7cf916264f4c269a163192c52c3a |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 10 01:47:53 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 10 01:48:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=299d80e3 |
| 7 |
|
| 8 |
dev-qt/qtwebengine: fix build on pax kernel |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/634220 |
| 11 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
| 12 |
|
| 13 |
.../qtwebengine-5.9.3-paxmark-mksnapshot.patch | 41 ++++++++++++++++++++++ |
| 14 |
dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild | 2 +- |
| 15 |
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 2 +- |
| 16 |
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 +- |
| 17 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 +- |
| 18 |
5 files changed, 45 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 00000000..ecedaf62 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch |
| 25 |
@@ -0,0 +1,41 @@ |
| 26 |
+Bug: https://bugs.gentoo.org/634220 |
| 27 |
+ |
| 28 |
+--- a/src/3rdparty/chromium/v8/BUILD.gn |
| 29 |
++++ b/src/3rdparty/chromium/v8/BUILD.gn |
| 30 |
+@@ -661,6 +661,7 @@ action("run_mksnapshot") { |
| 31 |
+ |
| 32 |
+ deps = [ |
| 33 |
+ ":mksnapshot($v8_snapshot_toolchain)", |
| 34 |
++ ":run_paxmark", |
| 35 |
+ ] |
| 36 |
+ |
| 37 |
+ script = "tools/run.py" |
| 38 |
+@@ -706,6 +707,28 @@ action("run_mksnapshot") { |
| 39 |
+ args += [ rebase_path(v8_embed_script, root_build_dir) ] |
| 40 |
+ } |
| 41 |
+ } |
| 42 |
++action("run_paxmark") { |
| 43 |
++ visibility = [ ":*" ] # Only targets in this file can depend on this. |
| 44 |
++ |
| 45 |
++ deps = [ |
| 46 |
++ ":mksnapshot($v8_snapshot_toolchain)", |
| 47 |
++ ] |
| 48 |
++ |
| 49 |
++ script = "/usr/sbin/pypaxctl" |
| 50 |
++ |
| 51 |
++ sources = [] |
| 52 |
++ |
| 53 |
++ outputs = [ |
| 54 |
++ "$target_out_dir/mksnapshot", |
| 55 |
++ ] |
| 56 |
++ |
| 57 |
++ args = [ |
| 58 |
++ "-sm", |
| 59 |
++ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", |
| 60 |
++ "root_out_dir") + "/mksnapshot", |
| 61 |
++ root_build_dir), |
| 62 |
++ ] |
| 63 |
++} |
| 64 |
+ |
| 65 |
+ action("run_mkpeephole") { |
| 66 |
+ visibility = [ ":*" ] # Only targets in this file can depend on this. |
| 67 |
|
| 68 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild |
| 69 |
index 4191302a..c970853b 100644 |
| 70 |
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild |
| 71 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild |
| 72 |
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND} |
| 73 |
" |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) |
| 77 |
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
| 78 |
|
| 79 |
# bug 620444 - ensure local headers are used |
| 80 |
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die |
| 81 |
|
| 82 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
| 83 |
index 4191302a..c970853b 100644 |
| 84 |
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
| 85 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
| 86 |
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND} |
| 87 |
" |
| 88 |
|
| 89 |
src_prepare() { |
| 90 |
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) |
| 91 |
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
| 92 |
|
| 93 |
# bug 620444 - ensure local headers are used |
| 94 |
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die |
| 95 |
|
| 96 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild |
| 97 |
index 2b51fbf7..635faf47 100644 |
| 98 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild |
| 99 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild |
| 100 |
@@ -76,7 +76,7 @@ DEPEND="${RDEPEND} |
| 101 |
PATCHES=( "${FILESDIR}/${PN}-5.9.3-icu-60.1.patch" ) |
| 102 |
|
| 103 |
src_prepare() { |
| 104 |
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) |
| 105 |
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
| 106 |
|
| 107 |
# bug 620444 - ensure local headers are used |
| 108 |
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die |
| 109 |
|
| 110 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 111 |
index 4191302a..c970853b 100644 |
| 112 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 113 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 114 |
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND} |
| 115 |
" |
| 116 |
|
| 117 |
src_prepare() { |
| 118 |
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) |
| 119 |
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
| 120 |
|
| 121 |
# bug 620444 - ensure local headers are used |
| 122 |
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die |
Archives