pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mono6: don't error out if 'paxctl' doesn't exist.



Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Thu Aug 15 16:05:23 2019 +0300
Changeset:	aaaab12e039b038484fe5a00bb61301c0dab2735

Modified Files:
	mono6/distinfo
	mono6/patches/patch-runtime_mono-wrapper.in

Log Message:
mono6: don't error out if 'paxctl' doesn't exist.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aaaab12e039b038484fe5a00bb61301c0dab2735

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mono6/distinfo                              | 2 +-
 mono6/patches/patch-runtime_mono-wrapper.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs:
diff --git a/mono6/distinfo b/mono6/distinfo
index 1d0dca7847..1dc2bb9e9a 100644
--- a/mono6/distinfo
+++ b/mono6/distinfo
@@ -22,4 +22,4 @@ SHA1 (patch-mono_tests_Makefile.am) = a5bf145619a50c8c256c32ffdb5b51f9e04f874c
 SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca
 SHA1 (patch-mono_utils_mono-state.c) = 6a6d83e1779a5167e8f22ba1dedce9b3203705c4
 SHA1 (patch-mono_utils_mono-utils-debug.c) = 30b0ab55c9227705026a8edd1e4bb693ae4f9953
-SHA1 (patch-runtime_mono-wrapper.in) = aedf3d2cdfe2504f021c6dec7992164542db0463
+SHA1 (patch-runtime_mono-wrapper.in) = 6d396f9ddf92e522111421ce9b8ec26988438f48
diff --git a/mono6/patches/patch-runtime_mono-wrapper.in b/mono6/patches/patch-runtime_mono-wrapper.in
index 72a8791a82..f473ad8767 100644
--- a/mono6/patches/patch-runtime_mono-wrapper.in
+++ b/mono6/patches/patch-runtime_mono-wrapper.in
@@ -8,5 +8,5 @@ Mark the mono executable as not MPROTECT safe during the build.
  fi
  MONO_EXECUTABLE=${MONO_EXECUTABLE:-"$r/@mono_runtime@"}
  export MONO_CFG_DIR PATH
-+paxctl +m $(readlink -f "$MONO_EXECUTABLE") 2>/dev/null
++paxctl +m $(readlink -f "$MONO_EXECUTABLE") | true 2>/dev/null
  exec "$r/libtool" --mode=execute "${MONO_EXECUTABLE_WRAPPER}" --config "@mono_cfg_dir@/mono/config" "$@"


Home | Main Index | Thread Index | Old Index