[pkgsrc/trunk]: pkgsrc/lang/mono fix arm build

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c861eafab310
branches:  trunk
changeset: 639717:c861eafab310
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Tue Sep 23 22:26:24 2014 +0000

description:
fix arm build

diffstat:

 lang/mono/distinfo                           |   4 ++--
 lang/mono/patches/patch-mono_mini_mini-arm.c |  23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diffs (73 lines):

diff -r 7326d5216f43 -r c861eafab310 lang/mono/distinfo
--- a/lang/mono/distinfo        Tue Sep 23 22:21:43 2014 +0000
+++ b/lang/mono/distinfo        Tue Sep 23 22:26:24 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.95 2014/08/21 07:49:56 wiz Exp $
+$NetBSD: distinfo,v 1.96 2014/09/23 22:26:24 jmcneill Exp $
 
 SHA1 (mono-3.6.0.tar.bz2) = 54150bf88d6ebdaaa40c474c66680b06a875f060
 RMD160 (mono-3.6.0.tar.bz2) = bf416bd14c6ef014b08f9750ac86b6dbd5a3d434
@@ -40,7 +40,7 @@
 SHA1 (patch-do) = 6cd2e8c6d9321243a1fd9462aef992e1f33daef9
 SHA1 (patch-man_mprof-report.1) = fccadd7c284a3ce50919534b6dacb2da002edef8
 SHA1 (patch-mono_io-layer_sockets.c) = 8c4f5fbc3469831a1c03680ed493b96c3b50199c
-SHA1 (patch-mono_mini_mini-arm.c) = d0945d14cf8a8eef691f29a181c55bb0436ffd98
+SHA1 (patch-mono_mini_mini-arm.c) = 5df6fcb73a04fcd0f97156514e70b6ed6ebd2394
 SHA1 (patch-mono_profiler_proflog.c) = 23e43af9d35d9fcb41a3d79b01d5494169fa15c2
 SHA1 (patch-mono_unit-tests_Makefile.in) = 882207b8d609d649c9e098ccd883ed4b5ba445b5
 SHA1 (patch-mono_utils_mono-compiler.h) = 76822de9dde03bac11a16c4cc687728566d98235
diff -r 7326d5216f43 -r c861eafab310 lang/mono/patches/patch-mono_mini_mini-arm.c
--- a/lang/mono/patches/patch-mono_mini_mini-arm.c      Tue Sep 23 22:21:43 2014 +0000
+++ b/lang/mono/patches/patch-mono_mini_mini-arm.c      Tue Sep 23 22:26:24 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-mono_mini_mini-arm.c,v 1.2 2014/08/21 07:49:56 wiz Exp $
+$NetBSD: patch-mono_mini_mini-arm.c,v 1.3 2014/09/23 22:26:24 jmcneill Exp $
 
 --- mono/mini/mini-arm.c.orig  2014-08-12 16:50:38.000000000 +0000
 +++ mono/mini/mini-arm.c
@@ -14,22 +14,31 @@
  #if defined(__ARM_EABI__) && defined(__linux__) && !defined(PLATFORM_ANDROID) && !defined(__native_client__)
  #define HAVE_AEABI_READ_TP 1
  #endif
-@@ -942,6 +947,34 @@ mono_arch_init (void)
+@@ -891,6 +896,10 @@ void
+ mono_arch_init (void)
+ {
+       const char *cpu_arch;
++#if defined(__NetBSD__)
++      char *s = NULL;
++      size_t len;
++#endif
+ 
+       InitializeCriticalSection (&mini_arch_mutex);
+ #ifdef MONO_ARCH_SOFT_DEBUG_SUPPORTED
+@@ -942,6 +951,32 @@ mono_arch_init (void)
           have a way to properly detect CPU features on it. */
        thumb_supported = TRUE;
        iphone_abi = TRUE;
 +#elif defined(__NetBSD__)
-+      char *s = NULL;
-+      size_t len;
 +      if (sysctlbyname("machdep.cpu_arch", NULL, &len, NULL, 0) < 0) {
 +              /* sysctlbyname error */
-+              return opts;
++              return;
 +      }
 +      s = malloc(len);
 +      if (sysctlbyname("machdep.cpu_arch", s, &len, NULL, 0) < 0) {
 +              /* sysctlbyname error */
 +              free(s);
-+              return opts;
++              return;
 +      }
 +
 +      switch (s[0]) {
@@ -49,7 +58,7 @@
  #else
        thumb_supported = mono_hwcap_arm_has_thumb;
        thumb2_supported = mono_hwcap_arm_has_thumb2;
-@@ -1154,6 +1187,11 @@ mono_arch_flush_icache (guint8 *code, gi
+@@ -1154,6 +1189,11 @@ mono_arch_flush_icache (guint8 *code, gi
  #ifdef MONO_CROSS_COMPILE
  #elif __APPLE__
        sys_icache_invalidate (code, size);