Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mono/
Date: Mon, 23 Nov 2015 11:36:51
Message-Id: 1448278480.1ed77efedf7b762cea57373c02b299862198ea2f.perfinion@gentoo
1 commit: 1ed77efedf7b762cea57373c02b299862198ea2f
2 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 23 11:34:12 2015 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 23 11:34:40 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed77efe
7
8 dev-lang/mono: do not call paxctl directly
9
10 paxmark.sh should be used instead which follows XT/PT marks correctly
11
12 Gentoo-Bug: https://bugs.gentoo.org/532244
13
14 Package-Manager: portage-2.2.20.1
15
16 dev-lang/mono/mono-2.10.9-r2.ebuild | 3 ++-
17 dev-lang/mono/mono-3.12.1.ebuild | 5 +++--
18 dev-lang/mono/mono-4.0.3.20.ebuild | 5 +++--
19 3 files changed, 8 insertions(+), 5 deletions(-)
20
21 diff --git a/dev-lang/mono/mono-2.10.9-r2.ebuild b/dev-lang/mono/mono-2.10.9-r2.ebuild
22 index 8f93814..0938c29 100644
23 --- a/dev-lang/mono/mono-2.10.9-r2.ebuild
24 +++ b/dev-lang/mono/mono-2.10.9-r2.ebuild
25 @@ -64,9 +64,10 @@ src_prepare() {
26 # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it doesn't
27 # get killed in the build process when MPROTECT is enabled. #286280
28 # RANDMMAP kills the build process to #347365
29 + # use paxmark.sh to get PT/XT logic #532244
30 if use pax_kernel ; then
31 ewarn "We are disabling MPROTECT on the mono binary."
32 - sed '/exec "/ i\paxctl-ng -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
33 + sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
34 fi
35 }
36
37
38 diff --git a/dev-lang/mono/mono-3.12.1.ebuild b/dev-lang/mono/mono-3.12.1.ebuild
39 index 14544b9..9560282 100644
40 --- a/dev-lang/mono/mono-3.12.1.ebuild
41 +++ b/dev-lang/mono/mono-3.12.1.ebuild
42 @@ -46,13 +46,14 @@ pkg_setup() {
43
44 src_prepare() {
45 # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
46 - # get killed in the build proces when MPROTEC is enable. #286280
47 + # get killed in the build proces when MPROTECT is enable. #286280
48 # RANDMMAP kill the build proces to #347365
49 + # use paxmark.sh to get PT/XT logic #532244
50 if use pax_kernel ; then
51 ewarn "We are disabling MPROTECT on the mono binary."
52
53 # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
54 - sed '/exec "/ i\paxctl-ng -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
55 + sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
56 fi
57
58 # mono build system can fail otherwise
59
60 diff --git a/dev-lang/mono/mono-4.0.3.20.ebuild b/dev-lang/mono/mono-4.0.3.20.ebuild
61 index 89fcad9..2675538 100644
62 --- a/dev-lang/mono/mono-4.0.3.20.ebuild
63 +++ b/dev-lang/mono/mono-4.0.3.20.ebuild
64 @@ -51,13 +51,14 @@ pkg_setup() {
65
66 src_prepare() {
67 # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
68 - # get killed in the build proces when MPROTEC is enable. #286280
69 + # get killed in the build proces when MPROTECT is enable. #286280
70 # RANDMMAP kill the build proces to #347365
71 + # use paxmark.sh to get PT/XT logic #532244
72 if use pax_kernel ; then
73 ewarn "We are disabling MPROTECT on the mono binary."
74
75 # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
76 - sed '/exec "/ i\paxctl-ng -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
77 + sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
78 fi
79
80 # mono build system can fail otherwise