Fri Apr 3 09:02:24 2015 UTC ()
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.


(jperkin)
diff -r1.13 -r1.14 pkgsrc/lang/ruby21-base/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/ruby21-base/patches/patch-configure
cvs diff -r1.13 -r1.14 pkgsrc/lang/ruby21-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby21-base/Attic/distinfo 2015/03/08 15:08:33 1.13
+++ pkgsrc/lang/ruby21-base/Attic/distinfo 2015/04/03 09:02:24 1.14
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.13 2015/03/08 15:08:33 taca Exp $ 1$NetBSD: distinfo,v 1.14 2015/04/03 09:02:24 jperkin Exp $
2 2
3SHA1 (ruby-2.1.5.tar.bz2) = d822e022bb8875724852f049f499f101d24a7fe5 3SHA1 (ruby-2.1.5.tar.bz2) = d822e022bb8875724852f049f499f101d24a7fe5
4RMD160 (ruby-2.1.5.tar.bz2) = 32019c949a8c9bb716f6683a20f19231da452fda 4RMD160 (ruby-2.1.5.tar.bz2) = 32019c949a8c9bb716f6683a20f19231da452fda
5Size (ruby-2.1.5.tar.bz2) = 11994454 bytes 5Size (ruby-2.1.5.tar.bz2) = 11994454 bytes
6SHA1 (patch-configure) = 40da4aec83fcb9cf026d2b458ff3beb6dcf7776a 6SHA1 (patch-configure) = 3c9f007caddd7155c3f3495f81eabe55b86651a5
7SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2 7SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2
8SHA1 (patch-ext_tk_extconf.rb) = fc80ef5a2859736ae85303cfb2fc78ce8bc70fbc 8SHA1 (patch-ext_tk_extconf.rb) = fc80ef5a2859736ae85303cfb2fc78ce8bc70fbc
9SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb 9SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb
10SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132 10SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132
11SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323 11SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323
12SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = 24b9f282558200780adbf93e71edd1aa52d1c82b 12SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = 24b9f282558200780adbf93e71edd1aa52d1c82b
13SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = fb0cb5a138c2ae311d368ec4472ddd6bc36a0709 13SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = fb0cb5a138c2ae311d368ec4472ddd6bc36a0709
14SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf 14SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf
15SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = b0786f50ebab4b5a0ccf916054bc13fbd6820541 15SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = b0786f50ebab4b5a0ccf916054bc13fbd6820541
16SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 92a4bc7b995554b9933b1e9f9ce4df87e365bcfb 16SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 92a4bc7b995554b9933b1e9f9ce4df87e365bcfb
17SHA1 (patch-ext_tk_tcltklib.c) = 475affcb88a06ac6daf622814a9da5027ca3d34e 17SHA1 (patch-ext_tk_tcltklib.c) = 475affcb88a06ac6daf622814a9da5027ca3d34e
18SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 18SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
19SHA1 (patch-lib_rdoc_text.rb) = 71be8fa7620483e43ddf00001f44bc6c5ccb75ee 19SHA1 (patch-lib_rdoc_text.rb) = 71be8fa7620483e43ddf00001f44bc6c5ccb75ee
cvs diff -r1.2 -r1.3 pkgsrc/lang/ruby21-base/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/ruby21-base/patches/Attic/patch-configure 2014/05/21 03:19:57 1.2
+++ pkgsrc/lang/ruby21-base/patches/Attic/patch-configure 2015/04/03 09:02:24 1.3
@@ -1,105 +1,114 @@ @@ -1,105 +1,114 @@
1$NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $ 1$NetBSD: patch-configure,v 1.3 2015/04/03 09:02:24 jperkin Exp $
2 2
3* Adding Interix and MirBSD support. 3* Adding Interix and MirBSD support.
4* Ignore doxygen. 4* Ignore doxygen.
5 5
6--- configure.orig 2014-05-08 15:52:19.000000000 +0000 6--- configure.orig 2014-11-13 13:38:30.000000000 +0000
7+++ configure 7+++ configure
8@@ -8571,6 +8571,10 @@ esac 8@@ -5271,7 +5271,7 @@ esac
 9 else
 10 if test x"$target_alias" = x; then
 11 case "$target_os" in #(
 12- darwin*) :
 13+ notdarwin*) :
 14
 15 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
 16 $as_echo_n "checking for real target cpu... " >&6; }
 17@@ -8631,6 +8631,10 @@ esac
9 ac_cv_func_isinf=yes 18 ac_cv_func_isinf=yes
10 ac_cv_func_isnan=yes 19 ac_cv_func_isnan=yes
11 ;; #( 20 ;; #(
12+ interix*) : 21+ interix*) :
13+ LIBS="-lm $LIBS" 22+ LIBS="-lm $LIBS"
14+ ac_cv_func_getpgrp_void=yes 23+ ac_cv_func_getpgrp_void=yes
15+ ;; #( 24+ ;; #(
16 nacl) : 25 nacl) :
17  26
18 LIBS="-lm $LIBS" 27 LIBS="-lm $LIBS"
19@@ -16204,6 +16208,8 @@ else 28@@ -16323,6 +16327,8 @@ else
20 # ifdef _MSC_VER 29 # ifdef _MSC_VER
21 # include <malloc.h> 30 # include <malloc.h>
22 # define alloca _alloca 31 # define alloca _alloca
23+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) 32+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
24+# include <stdlib.h> 33+# include <stdlib.h>
25 # else 34 # else
26 # ifdef HAVE_ALLOCA_H 35 # ifdef HAVE_ALLOCA_H
27 # include <alloca.h> 36 # include <alloca.h>
28@@ -20007,7 +20013,9 @@ esac ;; #( 37@@ -20040,7 +20046,9 @@ esac ;; #(
29 interix*) : 38 interix*) :
30 : ${LDSHARED='$(CC) -shared'} 39 : ${LDSHARED='$(CC) -shared'}
31 XLDFLAGS="$XLDFLAGS -Wl,-E" 40 XLDFLAGS="$XLDFLAGS -Wl,-E"
32+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' 41+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
33 LIBPATHFLAG=" -L%1\$-s" 42 LIBPATHFLAG=" -L%1\$-s"
34+ RPATHFLAG=' -Wl,-R%1$-s' 43+ RPATHFLAG=' -Wl,-R%1$-s'
35 rb_cv_dlopen=yes ;; #( 44 rb_cv_dlopen=yes ;; #(
36 freebsd*|dragonfly*) : 45 freebsd*|dragonfly*) :
37  46
38@@ -21008,7 +21016,7 @@ esac 47@@ -21041,7 +21049,7 @@ esac
39 freebsd*|dragonfly*) : 48 freebsd*|dragonfly*) :
40  49
41 SOLIBS='$(LIBS)' 50 SOLIBS='$(LIBS)'
42- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' 51- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
43+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' 52+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
44 if test "$rb_cv_binary_elf" != "yes" ; then 53 if test "$rb_cv_binary_elf" != "yes" ; then
45 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" 54 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
46 LIBRUBY_ALIASES='' 55 LIBRUBY_ALIASES=''
47@@ -21087,7 +21095,12 @@ esac 56@@ -21120,7 +21128,12 @@ esac
48 ;; #( 57 ;; #(
49 interix*) : 58 interix*) :
50  59
51- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' 60- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
52+ SOLIBS='$(LIBS)' 61+ SOLIBS='$(LIBS)'
53+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 62+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
54+ # link explicitly to 0x48000000 63+ # link explicitly to 0x48000000
55+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' 64+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
56+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' 65+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)'
57+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 66+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
58 ;; #( 67 ;; #(
59 mingw*|cygwin*|mswin*) : 68 mingw*|cygwin*|mswin*) :
60  69
61@@ -21245,7 +21258,7 @@ esac 70@@ -21278,7 +21291,7 @@ esac
62 esac 71 esac
63 if test "$enable_rpath" = yes; then 72 if test "$enable_rpath" = yes; then
64 test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS " 73 test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
65- LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix}" 74- LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix}"
66+ LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${PREFIX}/lib" 75+ LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${PREFIX}/lib"
67 test "x$cross_compiling" = xyes || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS -L${libprefix}" 76 test "x$cross_compiling" = xyes || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS -L${libprefix}"
68 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" 77 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
69 LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC" 78 LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
70@@ -21421,11 +21434,7 @@ if test "$install_doc" != no; then 79@@ -21591,11 +21604,7 @@ if test "$install_doc" != no; then
71 else 80 else
72 RDOCTARGET="nodoc" 81 RDOCTARGET="nodoc"
73 fi 82 fi
74- if test "$install_capi" != no -a -n "$DOXYGEN"; then 83- if test "$install_capi" != no -a -n "$DOXYGEN"; then
75- CAPITARGET="capi" 84- CAPITARGET="capi"
76- else 85- else
77- CAPITARGET="nodoc" 86- CAPITARGET="nodoc"
78- fi 87- fi
79+ CAPITARGET="nodoc" 88+ CAPITARGET="nodoc"
80 else 89 else
81 RDOCTARGET="nodoc" 90 RDOCTARGET="nodoc"
82 CAPITARGET="nodoc" 91 CAPITARGET="nodoc"
83@@ -22010,7 +22019,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t 92@@ -22180,7 +22189,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t
84 elif test -z "${ruby_version}"; then 93 elif test -z "${ruby_version}"; then
85 as_fn_error $? "No ruby version, No place for bundled libraries" "$LINENO" 5 94 as_fn_error $? "No ruby version, No place for bundled libraries" "$LINENO" 5
86 else 95 else
87- RUBY_LIB_VERSION="\"${ruby_version}\"" 96- RUBY_LIB_VERSION="\"${ruby_version}\""
88+ RUBY_LIB_VERSION="${ruby_version}" 97+ RUBY_LIB_VERSION="${ruby_version}"
89 fi 98 fi
90  99
91  100
92@@ -23516,17 +23525,7 @@ which seems to be undefined. Please mak 101@@ -23686,17 +23695,7 @@ which seems to be undefined. Please mak
93 "Makefile":F) 102 "Makefile":F)
94 tmpmk=confmk$$.tmp 103 tmpmk=confmk$$.tmp
95 { 104 {
96- if test ${VCS+set}; then 105- if test ${VCS+set}; then
97- : 106- :
98- elif svn info "$srcdir" > /dev/null 2>&1; then 107- elif svn info "$srcdir" > /dev/null 2>&1; then
99- VCS='svn' 108- VCS='svn'
100- elif test -d "$srcdir/.git/svn"; then 109- elif test -d "$srcdir/.git/svn"; then
101- VCS='git svn' 110- VCS='git svn'
102- elif test -d "$srcdir/.git"; then 111- elif test -d "$srcdir/.git"; then
103- VCS='git' 112- VCS='git'
104- else 113- else
105- VCS='echo cannot' 114- VCS='echo cannot'