pkgsrc-WIP-changes archive

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

mono6: Fix the Python executable name in a Makefile.



Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Fri Aug 2 15:52:22 2019 +0100
Changeset:	aaf0668706bf25b5cc12dd708166ccac0cbff65e

Modified Files:
	mono6/Makefile
	mono6/distinfo
	mono6/patches/patch-mono_mini_Makefile.am.in

Log Message:
mono6: Fix the Python executable name in a Makefile.

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

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

diffstat:
 mono6/Makefile                               |  6 ++++++
 mono6/distinfo                               |  2 +-
 mono6/patches/patch-mono_mini_Makefile.am.in | 11 +++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diffs:
diff --git a/mono6/Makefile b/mono6/Makefile
index 7049817e13..7fa051fc25 100644
--- a/mono6/Makefile
+++ b/mono6/Makefile
@@ -127,6 +127,12 @@ SUBST_MESSAGE.fix-libx11=	Fixing libX11 search path configuration
 SUBST_FILES.fix-libx11=		configure
 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_VARS.fix-python=		PYTHONBIN
+
 .include "../../mk/bsd.prefs.mk"
 
 # XXX remove
diff --git a/mono6/distinfo b/mono6/distinfo
index d491531c93..4f5707c3a4 100644
--- a/mono6/distinfo
+++ b/mono6/distinfo
@@ -8,7 +8,7 @@ SHA1 (patch-configure.ac) = cc4f5bf80495c3248a161d1b857e2aa63a437e4e
 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) = d8d7e61587a018ebe42d3365a2c061e1ecba9695
+SHA1 (patch-mono_mini_Makefile.am.in) = 7b6a9b5c54339441275af02c7d3033bcbba7e295
 SHA1 (patch-mono_native_Makefile.am) = 47e57623ebfce32f13a5fc1c19a0dbcb31dad8d4
 SHA1 (patch-mono_native_mono-native-platform.h) = 845c921b4a84146b78f4f94c9380890892f5ff29
 SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca
diff --git a/mono6/patches/patch-mono_mini_Makefile.am.in b/mono6/patches/patch-mono_mini_Makefile.am.in
index f5ce580957..2f32c113a0 100644
--- a/mono6/patches/patch-mono_mini_Makefile.am.in
+++ b/mono6/patches/patch-mono_mini_Makefile.am.in
@@ -3,6 +3,8 @@ $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
@@ -13,3 +15,12 @@ We're going to need RWX mappings.
  	ln -sf $< $@
  
  mono.exe: mono-$(mono_bin_suffix).exe
+@@ -779,7 +780,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.i
+ 
+ GENMDESC_OPTS=
+ 
+-GENMDESC_PRG=python $(srcdir)/genmdesc.py $(target_define) $(srcdir)
++GENMDESC_PRG=@PYTHONBIN@ $(srcdir)/genmdesc.py $(target_define) $(srcdir)
+ 
+ cpu-wasm.h: mini-ops.h cpu-wasm.md
+ 	$(GENMDESC_PRG) cpu-wasm.h wasm_desc $(srcdir)/cpu-wasm.md


Home | Main Index | Thread Index | Old Index