Fix portability

7 files changed, 91 insertions, 0 deletions

diff --git a/lang/mono6/patches/patch-acceptance-tests_Makefile.in b/lang/mono6/patches/patch-acceptance-tests_Makefile.in
new file mode 100644
index 00000000000..92a6523a26c
--- /dev/null
+++ b/lang/mono6/patches/patch-acceptance-tests_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-acceptance-tests_Makefile.in,v 1.1 2020/03/29 01:07:01 joerg Exp $
+
+--- acceptance-tests/Makefile.in.orig	2020-03-27 23:40:55.976678079 +0000
++++ acceptance-tests/Makefile.in
+@@ -5846,7 +5846,7 @@ __bump-version-%:
+ 
+ __bump-branch-%:
+ 	@if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
+-	@if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
++	@if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
+ 	python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
+ 	python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
+ 	@if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi
diff --git a/lang/mono6/patches/patch-mono_mini_Makefile.am.in b/lang/mono6/patches/patch-mono_mini_Makefile.am.in
new file mode 100644
index 00000000000..29897cbed07
--- /dev/null
+++ b/lang/mono6/patches/patch-mono_mini_Makefile.am.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-mono_mini_Makefile.am.in,v 1.3 2020/03/29 01:07:01 joerg Exp $
+
+--- mono/mini/Makefile.am.in.orig	2020-03-27 23:41:36.181681899 +0000
++++ mono/mini/Makefile.am.in
+@@ -1002,7 +1002,7 @@ endif
+ 	MONO_PATH=$(FULLAOT_MONO_PATH) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="$(FULLAOT_AOT_ARGS),$(LLVM_AOT_COMPILER_OPTS)" $(FULLAOT_TMP_DIR)/{$(fullaot_testing_deps_commas),*.exe} || exit 1
+ 	ln -s $(if $(MONO_EXECUTABLE),$(MONO_EXECUTABLE),$$PWD/mono) $(FULLAOT_TMP_DIR)/
+ 	for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_MONO_PATH) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(FULLAOT_ARGS) $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done
+-	if test x$(MIXED) == x1; then failed=0;i=0; while test $$i -lt 900; do i=`expr $$i + 1`; bash -c "echo -n '.'"; MONO_PATH=$(FULLAOT_MONO_PATH) MONO_DEBUG=aot-skip=$$i $(top_builddir)/runtime/mono-wrapper --full-aot-interp $(FULLAOT_TMP_DIR)/basic.exe > $(FULLAOT_TMP_DIR)/mixed.log || failed=1; if test $$failed -eq 1; then echo "Failed at $$i"; exit $$failed; fi; done; fi
++	if test x$(MIXED) = x1; then failed=0;i=0; while test $$i -lt 900; do i=`expr $$i + 1`; bash -c "echo -n '.'"; MONO_PATH=$(FULLAOT_MONO_PATH) MONO_DEBUG=aot-skip=$$i $(top_builddir)/runtime/mono-wrapper --full-aot-interp $(FULLAOT_TMP_DIR)/basic.exe > $(FULLAOT_TMP_DIR)/mixed.log || failed=1; if test $$failed -eq 1; then echo "Failed at $$i"; exit $$failed; fi; done; fi
+ 
+ # This can run in parallel
+ fullaot-libs: $(patsubst %,fullaot-tmp/%.dylib,$(FULLAOT_LIBS))
diff --git a/lang/mono6/patches/patch-mono_mini_Makefile.in b/lang/mono6/patches/patch-mono_mini_Makefile.in
new file mode 100644
index 00000000000..6be6486dbf0
--- /dev/null
+++ b/lang/mono6/patches/patch-mono_mini_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-mono_mini_Makefile.in,v 1.1 2020/03/29 01:07:01 joerg Exp $
+
+--- mono/mini/Makefile.in.orig	2020-03-27 23:42:13.693641403 +0000
++++ mono/mini/Makefile.in
+@@ -3314,7 +3314,7 @@ fullaotcheck: $(mono) $(fullaot_regtests
+ 	MONO_PATH=$(FULLAOT_MONO_PATH) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="$(FULLAOT_AOT_ARGS),$(LLVM_AOT_COMPILER_OPTS)" $(FULLAOT_TMP_DIR)/{$(fullaot_testing_deps_commas),*.exe} || exit 1
+ 	ln -s $(if $(MONO_EXECUTABLE),$(MONO_EXECUTABLE),$$PWD/mono) $(FULLAOT_TMP_DIR)/
+ 	for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_MONO_PATH) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(FULLAOT_ARGS) $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done
+-	if test x$(MIXED) == x1; then failed=0;i=0; while test $$i -lt 900; do i=`expr $$i + 1`; bash -c "echo -n '.'"; MONO_PATH=$(FULLAOT_MONO_PATH) MONO_DEBUG=aot-skip=$$i $(top_builddir)/runtime/mono-wrapper --full-aot-interp $(FULLAOT_TMP_DIR)/basic.exe > $(FULLAOT_TMP_DIR)/mixed.log || failed=1; if test $$failed -eq 1; then echo "Failed at $$i"; exit $$failed; fi; done; fi
++	if test x$(MIXED) = x1; then failed=0;i=0; while test $$i -lt 900; do i=`expr $$i + 1`; bash -c "echo -n '.'"; MONO_PATH=$(FULLAOT_MONO_PATH) MONO_DEBUG=aot-skip=$$i $(top_builddir)/runtime/mono-wrapper --full-aot-interp $(FULLAOT_TMP_DIR)/basic.exe > $(FULLAOT_TMP_DIR)/mixed.log || failed=1; if test $$failed -eq 1; then echo "Failed at $$i"; exit $$failed; fi; done; fi
+ 
+ # This can run in parallel
+ fullaot-libs: $(patsubst %,fullaot-tmp/%.dylib,$(FULLAOT_LIBS))
diff --git a/lang/mono6/patches/patch-mono_tests_Makefile.am b/lang/mono6/patches/patch-mono_tests_Makefile.am
new file mode 100644
index 00000000000..7bde5baba76
--- /dev/null
+++ b/lang/mono6/patches/patch-mono_tests_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD: patch-mono_tests_Makefile.am,v 1.3 2020/03/29 01:07:01 joerg Exp $
+
+--- mono/tests/Makefile.am.orig	2020-03-27 23:57:32.877761629 +0000
++++ mono/tests/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS = gc-descriptors . testing_gac a
+ check-local:
+ 	ok=:; \
+ 	$(MAKE) test-tailcall || ok=false; \
+-	if test x$(IGNORE_TEST_JIT) == x; then $(MAKE) test-jit || ok=false; fi; \
++	if test x$(IGNORE_TEST_JIT) = x; then $(MAKE) test-jit || ok=false; fi; \
+ 	$(MAKE) test-generic-sharing || ok=false; \
+ 	$(MAKE) test-type-load || ok=false; \
+ 	$(MAKE) test-multi-netmodule || ok=false; \
diff --git a/lang/mono6/patches/patch-mono_tests_Makefile.in b/lang/mono6/patches/patch-mono_tests_Makefile.in
new file mode 100644
index 00000000000..e6038264269
--- /dev/null
+++ b/lang/mono6/patches/patch-mono_tests_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-mono_tests_Makefile.in,v 1.1 2020/03/29 01:07:01 joerg Exp $
+
+--- mono/tests/Makefile.in.orig	2020-03-27 23:45:58.917886158 +0000
++++ mono/tests/Makefile.in
+@@ -2682,7 +2682,7 @@ uninstall-am:
+ check-local:
+ 	ok=:; \
+ 	$(MAKE) test-tailcall || ok=false; \
+-	if test x$(IGNORE_TEST_JIT) == x; then $(MAKE) test-jit || ok=false; fi; \
++	if test x$(IGNORE_TEST_JIT) = x; then $(MAKE) test-jit || ok=false; fi; \
+ 	$(MAKE) test-generic-sharing || ok=false; \
+ 	$(MAKE) test-type-load || ok=false; \
+ 	$(MAKE) test-multi-netmodule || ok=false; \
diff --git a/lang/mono6/patches/patch-mono_utils_jemalloc_Makefile.in b/lang/mono6/patches/patch-mono_utils_jemalloc_Makefile.in
new file mode 100644
index 00000000000..7598c22f635
--- /dev/null
+++ b/lang/mono6/patches/patch-mono_utils_jemalloc_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-mono_utils_jemalloc_Makefile.in,v 1.1 2020/03/29 01:07:01 joerg Exp $
+
+--- mono/utils/jemalloc/Makefile.in.orig	2020-03-27 23:41:16.834591125 +0000
++++ mono/utils/jemalloc/Makefile.in
+@@ -736,7 +736,7 @@ __bump-version-%:
+ 
+ __bump-branch-%:
+ 	@if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
+-	@if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
++	@if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
+ 	python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
+ 	python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
+ 	@if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi
diff --git a/lang/mono6/patches/patch-scripts_submodules_versions.mk b/lang/mono6/patches/patch-scripts_submodules_versions.mk
new file mode 100644
index 00000000000..4c020f7afc6
--- /dev/null
+++ b/lang/mono6/patches/patch-scripts_submodules_versions.mk
@@ -0,0 +1,13 @@
+$NetBSD: patch-scripts_submodules_versions.mk,v 1.1 2020/03/29 01:07:01 joerg Exp $
+
+--- scripts/submodules/versions.mk.orig	2020-03-27 23:43:04.070978830 +0000
++++ scripts/submodules/versions.mk
+@@ -111,7 +111,7 @@ __bump-version-%:
+ 
+ __bump-branch-%:
+ 	@if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
+-	@if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
++	@if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
+ 	python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
+ 	python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
+ 	@if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi