Disable CPU detection on Darwin, the result for 32-bit (i486) is incompatible

with pkgsrc MACHINE_ARCH (i386).  Fixes 32-bit build, no change for 64-bit.

2 files changed, 22 insertions, 13 deletions

diff --git a/lang/ruby21-base/distinfo b/lang/ruby21-base/distinfo
index 4d43da7d271..7615f36917d 100644
--- a/lang/ruby21-base/distinfo
+++ b/lang/ruby21-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2015/03/08 15:08:33 taca Exp $
+$NetBSD: distinfo,v 1.14 2015/04/03 09:02:24 jperkin Exp $
 
 SHA1 (ruby-2.1.5.tar.bz2) = d822e022bb8875724852f049f499f101d24a7fe5
 RMD160 (ruby-2.1.5.tar.bz2) = 32019c949a8c9bb716f6683a20f19231da452fda
 Size (ruby-2.1.5.tar.bz2) = 11994454 bytes
-SHA1 (patch-configure) = 40da4aec83fcb9cf026d2b458ff3beb6dcf7776a
+SHA1 (patch-configure) = 3c9f007caddd7155c3f3495f81eabe55b86651a5
 SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2
 SHA1 (patch-ext_tk_extconf.rb) = fc80ef5a2859736ae85303cfb2fc78ce8bc70fbc
 SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb
diff --git a/lang/ruby21-base/patches/patch-configure b/lang/ruby21-base/patches/patch-configure
index ca9c2b7dcff..86939d94b3a 100644
--- a/lang/ruby21-base/patches/patch-configure
+++ b/lang/ruby21-base/patches/patch-configure
@@ -1,11 +1,20 @@
-$NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
+$NetBSD: patch-configure,v 1.3 2015/04/03 09:02:24 jperkin Exp $
 
 * Adding Interix and MirBSD support.
 * Ignore doxygen.
 
---- configure.orig	2014-05-08 15:52:19.000000000 +0000
+--- configure.orig	2014-11-13 13:38:30.000000000 +0000
 +++ configure
-@@ -8571,6 +8571,10 @@ esac
+@@ -5271,7 +5271,7 @@ esac
+ else
+     if test x"$target_alias" = x; then
+ 	case "$target_os" in #(
+-  darwin*) :
++  notdarwin*) :
+ 
+ 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
+ $as_echo_n "checking for real target cpu... " >&6; }
+@@ -8631,6 +8631,10 @@ esac
  		ac_cv_func_isinf=yes
  		ac_cv_func_isnan=yes
  		 ;; #(
@@ -16,7 +25,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
    nacl) :
  
    LIBS="-lm $LIBS"
-@@ -16204,6 +16208,8 @@ else
+@@ -16323,6 +16327,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -25,7 +34,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -20007,7 +20013,9 @@ esac ;; #(
+@@ -20040,7 +20046,9 @@ esac ;; #(
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -35,7 +44,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -21008,7 +21016,7 @@ esac
+@@ -21041,7 +21049,7 @@ esac
    freebsd*|dragonfly*) :
  
  	SOLIBS='$(LIBS)'
@@ -44,7 +53,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  	if test "$rb_cv_binary_elf" != "yes" ; then
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -21087,7 +21095,12 @@ esac
+@@ -21120,7 +21128,12 @@ esac
  	 ;; #(
    interix*) :
  
@@ -58,7 +67,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  	 ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -21245,7 +21258,7 @@ esac
+@@ -21278,7 +21291,7 @@ esac
  esac
  if test "$enable_rpath" = yes; then
      test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
@@ -67,7 +76,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
      test "x$cross_compiling" = xyes || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS -L${libprefix}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
      LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
-@@ -21421,11 +21434,7 @@ if test "$install_doc" != no; then
+@@ -21591,11 +21604,7 @@ if test "$install_doc" != no; then
      else
  	RDOCTARGET="nodoc"
      fi
@@ -80,7 +89,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  else
      RDOCTARGET="nodoc"
      CAPITARGET="nodoc"
-@@ -22010,7 +22019,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t
+@@ -22180,7 +22189,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t
  elif test -z "${ruby_version}"; then
      as_fn_error $? "No ruby version, No place for bundled libraries" "$LINENO" 5
  else
@@ -89,7 +98,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  fi
  
  
-@@ -23516,17 +23525,7 @@ which seems to be undefined.  Please mak
+@@ -23686,17 +23695,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {