CVS commit: pkgsrc/lang/mono6

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat May 23 20:30:21 UTC 2020

Modified Files:
        pkgsrc/lang/mono6: distinfo
Added Files:
        pkgsrc/lang/mono6/patches: patch-acceptance-tests_microbench-perf_sh_in

Log Message:
lang/mono6: fix shell portability in acceptance tests


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/mono6/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/mono6/patches/patch-acceptance-tests_microbench-perf_sh_in

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

Modified files:

Index: pkgsrc/lang/mono6/distinfo
diff -u pkgsrc/lang/mono6/distinfo:1.9 pkgsrc/lang/mono6/distinfo:1.10
--- pkgsrc/lang/mono6/distinfo:1.9      Sun Mar 29 01:07:01 2020
+++ pkgsrc/lang/mono6/distinfo  Sat May 23 20:30:20 2020
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.9 2020/03/29 01:07:01 joerg Exp $
+$NetBSD: distinfo,v 1.10 2020/05/23 20:30:20 rillig Exp $
 
 SHA1 (mono-6.8.0.105.tar.xz) = e39aa0ac15b3b73ecf0767462798a5acde0aed79
 RMD160 (mono-6.8.0.105.tar.xz) = 5a84c75f941d5a2a645999e13da8458fc87d3bac
 SHA512 (mono-6.8.0.105.tar.xz) = 8207082f6c538037a17dba5e22576d8e9b0aac946df270ff34daad0857e7b1cfd71c8cf4851e74dd5338397c9587540f11b23e71776bca6dc2a1b89dbed2fd7e
 Size (mono-6.8.0.105.tar.xz) = 243441900 bytes
 SHA1 (patch-acceptance-tests_Makefile.in) = 66866b180ccce299a0d492add5330351611ec5f2
+SHA1 (patch-acceptance-tests_microbench-perf_sh_in) = d46118c1685e3e48a5b8594bf7f77acd2bebaf94
 SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246
 SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 847fa7f5a54e7583a87c40749efe5a99e513c3c9
 SHA1 (patch-data_net__2__0_Makefile.am) = dffb23423381a9031587536ee5de2b34610329ee
@@ -17,7 +18,6 @@ SHA1 (patch-libgc_pthread__stop__world.c
 SHA1 (patch-libgc_pthread__support.c) = b4fcf5ab1f5d5d06739891c1614ff870b8e4a4c5
 SHA1 (patch-mono_eglib_giconv.c) = 04d2559d3868605194efd6267da010870f53d961
 SHA1 (patch-mono_metadata_icall.c) = b326c16e9aa8f9ee154d937128e5e09fd31b235a
-SHA1 (patch-mono_metadata_mono-config.c) = d349721ff2b6b3b767208eacdc5882b9e6dc47b4
 SHA1 (patch-mono_metadata_w32mutex-unix.c) = c3d424fe4ae1079c9c664c876a087fb0134f2e22
 SHA1 (patch-mono_mini_Makefile.am.in) = 7f4555b53e74646d96c847862999e4eceaa86164
 SHA1 (patch-mono_mini_Makefile.in) = c8a96e8d9139b5f1c751abc2256af45c219e504e

Added files:

Index: pkgsrc/lang/mono6/patches/patch-acceptance-tests_microbench-perf_sh_in
diff -u /dev/null pkgsrc/lang/mono6/patches/patch-acceptance-tests_microbench-perf_sh_in:1.1
--- /dev/null   Sat May 23 20:30:21 2020
+++ pkgsrc/lang/mono6/patches/patch-acceptance-tests_microbench-perf_sh_in      Sat May 23 20:30:21 2020
@@ -0,0 +1,28 @@
+$NetBSD: patch-acceptance-tests_microbench-perf_sh_in,v 1.1 2020/05/23 20:30:21 rillig Exp $
+
+Shell portability.
+
+https://github.com/mono/mono/issues/19694
+
+--- acceptance-tests/microbench-perf.sh.in.orig        2020-02-04 17:00:30.000000000 +0000
++++ acceptance-tests/microbench-perf.sh.in     2020-05-03 13:09:59.908937340 +0000
+@@ -3,15 +3,13 @@
+ aotpattern="--aot="
+ 
+ # if this is an aot invoke
+-if [[ $@ =~ $aotpattern ]];
+-then
++case "$*" in *"$aotpattern"*)
+ # just aot the code
+ echo "$r/runtime/mono-wrapper $@"
+ exec $r/runtime/mono-wrapper $@
+-else
++;;
++*)
+ # else run it under perf
+ echo "$MONO_PERF_BINARY record -o $r/acceptance-tests/perf.data -v -s -g -- $r/mono/mini/mono-sgen $@"
+ exec $MONO_PERF_BINARY record -o $r/acceptance-tests/perf.data -v -s -g $r/mono/mini/mono-sgen $@
+-fi
+-
+-
++esac