pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
mono6: Change the place paxctl is applied and replace another python
Module Name: pkgsrc-wip
Committed By: nia <nia%netbsd.org@localhost>
Pushed By: nee
Date: Mon Aug 5 14:01:54 2019 +0100
Changeset: 87cdb969e317554b357e3fccb7e802625b0727a3
Modified Files:
mono6/Makefile
mono6/PLIST
mono6/distinfo
mono6/patches/patch-mono_mini_Makefile.am.in
Added Files:
mono6/patches/patch-mono_tests_Makefile.am
mono6/patches/patch-runtime_mono-wrapper.in
Log Message:
mono6: Change the place paxctl is applied and replace another python
With this, package creation now works for me.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=87cdb969e317554b357e3fccb7e802625b0727a3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
mono6/Makefile | 90 ++++++++++++++--------------
mono6/PLIST | 41 ++++---------
mono6/distinfo | 4 +-
mono6/patches/patch-mono_mini_Makefile.am.in | 13 +---
mono6/patches/patch-mono_tests_Makefile.am | 15 +++++
mono6/patches/patch-runtime_mono-wrapper.in | 12 ++++
6 files changed, 89 insertions(+), 86 deletions(-)
diffs:
diff --git a/mono6/Makefile b/mono6/Makefile
index 6ad2b15f58..5d1ac843b6 100644
--- a/mono6/Makefile
+++ b/mono6/Makefile
@@ -48,6 +48,7 @@ REPLACE_PYTHON+= scripts/mono-heapviz
REPLACE_BASH+= mono/arch/arm/dpiops.sh
REPLACE_BASH+= mono/arch/arm/vfpops.sh
+REPLACE_BASH+= scripts/mono-package-runtime
REPLACE_BASH+= scripts/mono-find-provides.in scripts/mono-find-requires.in
REPLACE_BASH+= scripts/mono-test-install web/mono-build-w32.sh
REPLACE_BASH+= mcs/class/Mono.Cairo/Samples/gtk/compile.sh
@@ -59,50 +60,48 @@ REPLACE_BASH+= mcs/mkinstalldirs mkinstalldirs
EGDIR= ${PREFIX}/share/examples/mono
-CONF_FILES+= ${EGDIR}/mono/2.0/Browsers/Compat.browser \
- ${PKG_SYSCONFDIR}/mono/2.0/Browsers/Compat.browser
-CONF_FILES+= ${EGDIR}/mono/2.0/DefaultWsdlHelpGenerator.aspx \
- ${PKG_SYSCONFDIR}/mono/2.0/DefaultWsdlHelpGenerator.aspx
-CONF_FILES+= ${EGDIR}/mono/2.0/machine.config \
- ${PKG_SYSCONFDIR}/mono/2.0/machine.config
-CONF_FILES+= ${EGDIR}/mono/2.0/settings.map \
- ${PKG_SYSCONFDIR}/mono/2.0/settings.map
-CONF_FILES+= ${EGDIR}/mono/2.0/web.config \
- ${PKG_SYSCONFDIR}/mono/2.0/web.config
-CONF_FILES+= ${EGDIR}/mono/4.0/Browsers/Compat.browser \
- ${PKG_SYSCONFDIR}/mono/4.0/Browsers/Compat.browser
-CONF_FILES+= ${EGDIR}/mono/4.0/DefaultWsdlHelpGenerator.aspx \
- ${PKG_SYSCONFDIR}/mono/4.0/DefaultWsdlHelpGenerator.aspx
-CONF_FILES+= ${EGDIR}/mono/4.0/machine.config \
- ${PKG_SYSCONFDIR}/mono/4.0/machine.config
-CONF_FILES+= ${EGDIR}/mono/4.0/settings.map \
- ${PKG_SYSCONFDIR}/mono/4.0/settings.map
-CONF_FILES+= ${EGDIR}/mono/4.0/web.config \
- ${PKG_SYSCONFDIR}/mono/4.0/web.config
-CONF_FILES+= ${EGDIR}/mono/4.5/Browsers/Compat.browser \
- ${PKG_SYSCONFDIR}/mono/4.5/Browsers/Compat.browser
-CONF_FILES+= ${EGDIR}/mono/4.5/DefaultWsdlHelpGenerator.aspx \
- ${PKG_SYSCONFDIR}/mono/4.5/DefaultWsdlHelpGenerator.aspx
-CONF_FILES+= ${EGDIR}/mono/4.5/machine.config \
- ${PKG_SYSCONFDIR}/mono/4.5/machine.config
-CONF_FILES+= ${EGDIR}/mono/4.5/settings.map \
- ${PKG_SYSCONFDIR}/mono/4.5/settings.map
-CONF_FILES+= ${EGDIR}/mono/4.5/web.config \
- ${PKG_SYSCONFDIR}/mono/4.5/web.config
-CONF_FILES+= ${EGDIR}/mono/browscap.ini \
- ${PKG_SYSCONFDIR}/mono/browscap.ini
-CONF_FILES+= ${EGDIR}/mono/config \
- ${PKG_SYSCONFDIR}/mono/config
-
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/mono/2.0
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/mono/2.0/Browsers
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/mono/4.0
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/mono/4.0/Browsers
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/mono/4.5
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/mono/4.5/Browsers
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/mono/mconfig
-
-INSTALLATION_DIRS+= share/examples/mono/4.5
+CONF_FILES+= ${EGDIR}/2.0/Browsers/Compat.browser \
+ ${PKG_SYSCONFDIR}/2.0/Browsers/Compat.browser
+CONF_FILES+= ${EGDIR}/2.0/DefaultWsdlHelpGenerator.aspx \
+ ${PKG_SYSCONFDIR}/2.0/DefaultWsdlHelpGenerator.aspx
+CONF_FILES+= ${EGDIR}/2.0/machine.config \
+ ${PKG_SYSCONFDIR}/2.0/machine.config
+CONF_FILES+= ${EGDIR}/2.0/settings.map \
+ ${PKG_SYSCONFDIR}/2.0/settings.map
+CONF_FILES+= ${EGDIR}/2.0/web.config \
+ ${PKG_SYSCONFDIR}/2.0/web.config
+CONF_FILES+= ${EGDIR}/4.0/Browsers/Compat.browser \
+ ${PKG_SYSCONFDIR}/4.0/Browsers/Compat.browser
+CONF_FILES+= ${EGDIR}/4.0/DefaultWsdlHelpGenerator.aspx \
+ ${PKG_SYSCONFDIR}/4.0/DefaultWsdlHelpGenerator.aspx
+CONF_FILES+= ${EGDIR}/4.0/machine.config \
+ ${PKG_SYSCONFDIR}/4.0/machine.config
+CONF_FILES+= ${EGDIR}/4.0/settings.map \
+ ${PKG_SYSCONFDIR}/4.0/settings.map
+CONF_FILES+= ${EGDIR}/4.0/web.config \
+ ${PKG_SYSCONFDIR}/4.0/web.config
+CONF_FILES+= ${EGDIR}/4.5/Browsers/Compat.browser \
+ ${PKG_SYSCONFDIR}/4.5/Browsers/Compat.browser
+CONF_FILES+= ${EGDIR}/4.5/DefaultWsdlHelpGenerator.aspx \
+ ${PKG_SYSCONFDIR}/4.5/DefaultWsdlHelpGenerator.aspx
+CONF_FILES+= ${EGDIR}/4.5/machine.config \
+ ${PKG_SYSCONFDIR}/4.5/machine.config
+CONF_FILES+= ${EGDIR}/4.5/settings.map \
+ ${PKG_SYSCONFDIR}/4.5/settings.map
+CONF_FILES+= ${EGDIR}/4.5/web.config \
+ ${PKG_SYSCONFDIR}/4.5/web.config
+CONF_FILES+= ${EGDIR}/browscap.ini \
+ ${PKG_SYSCONFDIR}/browscap.ini
+CONF_FILES+= ${EGDIR}/config \
+ ${PKG_SYSCONFDIR}/config
+
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/2.0
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/2.0/Browsers
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/4.0
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/4.0/Browsers
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/4.5
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/4.5/Browsers
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/mconfig
TEST_TARGET= check
@@ -133,7 +132,8 @@ SUBST_VARS.fix-libx11= X11BASE
SUBST_CLASSES+= fix-python
SUBST_STAGE.fix-python= pre-configure
SUBST_MESSAGE.fix-python= Fixing python binary name
-SUBST_FILES.fix-python= mono/mini/Makefile.am.in
+SUBST_FILES.fix-python+= mono/mini/Makefile.am.in
+SUBST_FILES.fix-python+= mono/tests/Makefile.am
SUBST_VARS.fix-python= PYTHONBIN
.include "../../mk/bsd.prefs.mk"
diff --git a/mono6/PLIST b/mono6/PLIST
index 622fcdb951..9f1c3cb462 100644
--- a/mono6/PLIST
+++ b/mono6/PLIST
@@ -89,23 +89,6 @@ bin/wsdl
bin/wsdl2
bin/xbuild
bin/xsd
-etc/mono/2.0/Browsers/Compat.browser
-etc/mono/2.0/DefaultWsdlHelpGenerator.aspx
-etc/mono/2.0/machine.config
-etc/mono/2.0/settings.map
-etc/mono/2.0/web.config
-etc/mono/4.0/Browsers/Compat.browser
-etc/mono/4.0/DefaultWsdlHelpGenerator.aspx
-etc/mono/4.0/machine.config
-etc/mono/4.0/settings.map
-etc/mono/4.0/web.config
-etc/mono/4.5/Browsers/Compat.browser
-etc/mono/4.5/DefaultWsdlHelpGenerator.aspx
-etc/mono/4.5/machine.config
-etc/mono/4.5/settings.map
-etc/mono/4.5/web.config
-etc/mono/browscap.ini
-etc/mono/config
include/mono-2.0/mono/cil/opcode.def
include/mono-2.0/mono/jit/jit.h
include/mono-2.0/mono/metadata/appdomain.h
@@ -149,7 +132,6 @@ lib/libmono-2.0.la
lib/libmono-2.0.so
lib/libmono-2.0.so.1
lib/libmono-2.0.so.1.0.0
-lib/libmono-btls-shared.so
lib/libmono-native.la
lib/libmono-profiler-aot-static.la
lib/libmono-profiler-aot.la
@@ -1106,17 +1088,14 @@ lib/mono/4.5/Microsoft.CSharp.dll
lib/mono/4.5/Microsoft.CSharp.targets
lib/mono/4.5/Microsoft.CodeAnalysis.CSharp.Scripting.dll
lib/mono/4.5/Microsoft.CodeAnalysis.CSharp.dll
-lib/mono/4.5/Microsoft.CodeAnalysis.CSharp.dll.so
lib/mono/4.5/Microsoft.CodeAnalysis.Scripting.dll
lib/mono/4.5/Microsoft.CodeAnalysis.VisualBasic.dll
lib/mono/4.5/Microsoft.CodeAnalysis.dll
-lib/mono/4.5/Microsoft.CodeAnalysis.dll.so
lib/mono/4.5/Microsoft.Common.targets
lib/mono/4.5/Microsoft.Common.tasks
lib/mono/4.5/Microsoft.VisualBasic.targets
lib/mono/4.5/Microsoft.VisualC.dll
lib/mono/4.5/Microsoft.Web.Infrastructure.dll
-lib/mono/4.5/Mono.Btls.Interface.dll
lib/mono/4.5/Mono.CSharp.dll
lib/mono/4.5/Mono.Cairo.dll
lib/mono/4.5/Mono.CodeContracts.dll
@@ -1144,7 +1123,6 @@ lib/mono/4.5/RabbitMQ.Client.Apigen.pdb
lib/mono/4.5/RabbitMQ.Client.dll
lib/mono/4.5/SMDiagnostics.dll
lib/mono/4.5/System.Collections.Immutable.dll
-lib/mono/4.5/System.Collections.Immutable.dll.so
lib/mono/4.5/System.ComponentModel.Composition.dll
lib/mono/4.5/System.ComponentModel.DataAnnotations.dll
lib/mono/4.5/System.Configuration.Install.dll
@@ -1193,7 +1171,6 @@ lib/mono/4.5/System.Reactive.Windows.Forms.dll
lib/mono/4.5/System.Reactive.Windows.Threading.dll
lib/mono/4.5/System.Reflection.Context.dll
lib/mono/4.5/System.Reflection.Metadata.dll
-lib/mono/4.5/System.Reflection.Metadata.dll.so
lib/mono/4.5/System.Runtime.Caching.dll
lib/mono/4.5/System.Runtime.CompilerServices.Unsafe.dll
lib/mono/4.5/System.Runtime.DurableInstancing.dll
@@ -1266,7 +1243,6 @@ lib/mono/4.5/crlupdate.exe
lib/mono/4.5/crlupdate.pdb
lib/mono/4.5/csc.exe
lib/mono/4.5/csc.exe.config
-lib/mono/4.5/csc.exe.so
lib/mono/4.5/csc.rsp
lib/mono/4.5/cscompmgd.dll
lib/mono/4.5/csharp.exe
@@ -1309,7 +1285,6 @@ lib/mono/4.5/makecert.pdb
lib/mono/4.5/mconfig.exe
lib/mono/4.5/mconfig.pdb
lib/mono/4.5/mcs.exe
-lib/mono/4.5/mcs.exe.so
lib/mono/4.5/mcs.pdb
lib/mono/4.5/mdbrebase.exe
lib/mono/4.5/mdbrebase.pdb
@@ -1343,7 +1318,6 @@ lib/mono/4.5/monop.pdb
lib/mono/4.5/mozroots.exe
lib/mono/4.5/mozroots.pdb
lib/mono/4.5/mscorlib.dll
-lib/mono/4.5/mscorlib.dll.so
lib/mono/4.5/mscorlib.pdb
lib/mono/4.5/pdb2mdb.exe
lib/mono/4.5/pdb2mdb.pdb
@@ -2689,8 +2663,6 @@ lib/mono/gac/Microsoft.VisualC/10.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualC.dll
lib/mono/gac/Microsoft.VisualC/10.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualC.pdb
lib/mono/gac/Microsoft.Web.Infrastructure/1.0.0.0__31bf3856ad364e35/Microsoft.Web.Infrastructure.dll
lib/mono/gac/Microsoft.Web.Infrastructure/1.0.0.0__31bf3856ad364e35/Microsoft.Web.Infrastructure.pdb
-lib/mono/gac/Mono.Btls.Interface/4.0.0.0__0738eb9f132ed756/Mono.Btls.Interface.dll
-lib/mono/gac/Mono.Btls.Interface/4.0.0.0__0738eb9f132ed756/Mono.Btls.Interface.pdb
lib/mono/gac/Mono.CSharp/4.0.0.0__0738eb9f132ed756/Mono.CSharp.dll
lib/mono/gac/Mono.CSharp/4.0.0.0__0738eb9f132ed756/Mono.CSharp.pdb
lib/mono/gac/Mono.Cairo/4.0.0.0__0738eb9f132ed756/Mono.Cairo.dll
@@ -3156,10 +3128,23 @@ man/man1/xbuild.1
man/man1/xsd.1
man/man5/mdoc.5
man/man5/mono-config.5
+share/examples/mono/2.0/Browsers/Compat.browser
+share/examples/mono/2.0/DefaultWsdlHelpGenerator.aspx
+share/examples/mono/2.0/machine.config
+share/examples/mono/2.0/settings.map
+share/examples/mono/2.0/web.config
+share/examples/mono/4.0/Browsers/Compat.browser
+share/examples/mono/4.0/DefaultWsdlHelpGenerator.aspx
+share/examples/mono/4.0/machine.config
+share/examples/mono/4.0/settings.map
+share/examples/mono/4.0/web.config
+share/examples/mono/4.5/Browsers/Compat.browser
share/examples/mono/4.5/DefaultWsdlHelpGenerator.aspx
share/examples/mono/4.5/machine.config
share/examples/mono/4.5/settings.map
share/examples/mono/4.5/web.config
+share/examples/mono/browscap.ini
+share/examples/mono/config
share/examples/mono/mconfig/config.xml
share/libgc-mono/README
share/libgc-mono/README.DGUX386
diff --git a/mono6/distinfo b/mono6/distinfo
index d45a63253d..049e714963 100644
--- a/mono6/distinfo
+++ b/mono6/distinfo
@@ -15,9 +15,11 @@ SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811b
SHA1 (patch-mcs_class_corlib_Test_Mono_MonoNativePlatformType.cs) = 3368edee232b184879091df3d68daf4900f744c2
SHA1 (patch-mono_metadata_icall.c) = 292c7bc4c959a3a5c1a982ccf2bc26a5300a0730
SHA1 (patch-mono_metadata_threads.c) = 5b55d0b3b5e506bf08ac14712f44a8db4594b254
-SHA1 (patch-mono_mini_Makefile.am.in) = 7b6a9b5c54339441275af02c7d3033bcbba7e295
+SHA1 (patch-mono_mini_Makefile.am.in) = 697b0b56d9b7ddb5f61cd105c2c9c5dfac53ed9b
SHA1 (patch-mono_native_Makefile.am) = 47e57623ebfce32f13a5fc1c19a0dbcb31dad8d4
SHA1 (patch-mono_native_mono-native-platform.h) = 845c921b4a84146b78f4f94c9380890892f5ff29
+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) = 97947a58b93fa50997649c12fcb5b471c2b05c8c
diff --git a/mono6/patches/patch-mono_mini_Makefile.am.in b/mono6/patches/patch-mono_mini_Makefile.am.in
index 2f32c113a0..d8da297709 100644
--- a/mono6/patches/patch-mono_mini_Makefile.am.in
+++ b/mono6/patches/patch-mono_mini_Makefile.am.in
@@ -1,21 +1,10 @@
$NetBSD$
-This is a JIT, we're using old boehm-gc that maps stuff RWX.
-We're going to need RWX mappings.
-
Replace python executable name.
--- mono/mini/Makefile.am.in.orig 2019-07-18 07:46:08.000000000 +0000
+++ mono/mini/Makefile.am.in
-@@ -126,6 +126,7 @@ endif
- if DISABLE_EXECUTABLES
- else
- mono: mono-$(mono_bin_suffix)
-+ -paxctl +m mono-$(mono_bin_suffix)
- ln -sf $< $@
-
- mono.exe: mono-$(mono_bin_suffix).exe
-@@ -779,7 +780,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.i
+@@ -779,7 +779,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.i
GENMDESC_OPTS=
diff --git a/mono6/patches/patch-mono_tests_Makefile.am b/mono6/patches/patch-mono_tests_Makefile.am
new file mode 100644
index 0000000000..e293cc55bf
--- /dev/null
+++ b/mono6/patches/patch-mono_tests_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Replace python executable name.
+
+--- mono/tests/Makefile.am.orig 2019-07-18 07:46:08.000000000 +0000
++++ mono/tests/Makefile.am
+@@ -3151,7 +3151,7 @@ coreclr-gcstress:
+ # Tests for the Mono lldb plugin
+ EXTRA_DIST += test_lldb.py test-lldb.cs
+ test-lldb: test-lldb.exe
+- python test_lldb.py $(JITTEST_PROG)
++ @PYTHONBIN@ test_lldb.py $(JITTEST_PROG)
+
+ noinst_LTLIBRARIES = libtest.la
+
diff --git a/mono6/patches/patch-runtime_mono-wrapper.in b/mono6/patches/patch-runtime_mono-wrapper.in
new file mode 100644
index 0000000000..3944485167
--- /dev/null
+++ b/mono6/patches/patch-runtime_mono-wrapper.in
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Mark the mono executable as not MPROTECT safe during the build.
+
+--- runtime/mono-wrapper.in.orig 2019-07-18 07:46:08.000000000 +0000
++++ runtime/mono-wrapper.in
+@@ -8,4 +8,5 @@ then
+ fi
+ MONO_EXECUTABLE=${MONO_EXECUTABLE:-"$r/@mono_runtime@"}
+ export MONO_CFG_DIR PATH
++paxctl +m $(readlink -f "$MONO_EXECUTABLE")
+ exec "$r/libtool" --mode=execute "${MONO_EXECUTABLE_WRAPPER}" --config "@mono_cfg_dir@/mono/config" "$@"
Home |
Main Index |
Thread Index |
Old Index