diff options
| author | jperkin <jperkin> | 2015-06-30 19:41:32 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-06-30 19:41:32 +0000 |
| commit | f5211b9e7ed6adad752e984aac6922a1119ea566 (patch) | |
| tree | 548c31e7edf5c070abbd114eb93df6e658b5a6b5 /lang | |
| parent | e2993950d3b925d8a0e216cf23dfc163cd1e57a5 (diff) | |
| download | pkgsrc-f5211b9e7ed6adad752e984aac6922a1119ea566.tar.gz | |
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.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby22-base/distinfo | 4 | ||||
| -rw-r--r-- | lang/ruby22-base/patches/patch-configure | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lang/ruby22-base/distinfo b/lang/ruby22-base/distinfo index 6b6dcff6e3a..741b168f7c0 100644 --- a/lang/ruby22-base/distinfo +++ b/lang/ruby22-base/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2015/06/23 14:04:40 taca Exp $ +$NetBSD: distinfo,v 1.6 2015/06/30 19:41:32 jperkin Exp $ SHA1 (ruby-2.2.2.tar.bz2) = de97ec6132ac76bb7c0f92b5ca4682138093af1b RMD160 (ruby-2.2.2.tar.bz2) = af9f1c4de12fc25c0d6e20bf339cc13e7d89df2d Size (ruby-2.2.2.tar.bz2) = 13314437 bytes -SHA1 (patch-configure) = 729397349d70492303534873194e35d4ffb98ba5 +SHA1 (patch-configure) = 8abbc486b8cf30bb789ef58d1cb289191dcd1af6 SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959 SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 diff --git a/lang/ruby22-base/patches/patch-configure b/lang/ruby22-base/patches/patch-configure index 8f2c6022b7d..9ff6e273aaf 100644 --- a/lang/ruby22-base/patches/patch-configure +++ b/lang/ruby22-base/patches/patch-configure @@ -1,10 +1,19 @@ -$NetBSD: patch-configure,v 1.2 2015/04/22 19:04:35 sevan Exp $ +$NetBSD: patch-configure,v 1.3 2015/06/30 19:41:32 jperkin Exp $ * Adding Interix support. * Ignore doxygen. ---- configure.orig 2015-02-27 07:34:18.000000000 +0000 +--- configure.orig 2015-04-13 14:18:08.000000000 +0000 +++ configure +@@ -5579,7 +5579,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; } @@ -8846,6 +8846,10 @@ esac ac_cv_func_isinf=yes ac_cv_func_isnan=yes |