Skip to content

Commit

Permalink
dev-lang/mono: do not call paxctl directly
Browse files Browse the repository at this point in the history
paxmark.sh should be used instead which follows XT/PT marks correctly

Gentoo-Bug: https://bugs.gentoo.org/532244

Package-Manager: portage-2.2.24
  • Loading branch information
perfinion committed Dec 22, 2015
1 parent 4f08df4 commit 97c69c3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions dev-lang/mono/mono-4.2.1.124.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,14 @@ pkg_setup() {

src_prepare() {
# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
# get killed in the build proces when MPROTEC is enable. #286280
# get killed in the build proces when MPROTECT is enable. #286280
# RANDMMAP kill the build proces to #347365
# use paxmark.sh to get PT/XT logic #532244
if use pax_kernel ; then
ewarn "We are disabling MPROTECT on the mono binary."

# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
sed '/exec "/ i\paxctl-ng -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
fi

# mono build system can fail otherwise
Expand Down
5 changes: 3 additions & 2 deletions dev-lang/mono/mono-4.2.2.10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,14 @@ pkg_setup() {

src_prepare() {
# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
# get killed in the build proces when MPROTEC is enable. #286280
# get killed in the build proces when MPROTECT is enable. #286280
# RANDMMAP kill the build proces to #347365
# use paxmark.sh to get PT/XT logic #532244
if use pax_kernel ; then
ewarn "We are disabling MPROTECT on the mono binary."

# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
sed '/exec "/ i\paxctl-ng -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
fi

# mono build system can fail otherwise
Expand Down

0 comments on commit 97c69c3

Please sign in to comment.