Tue Jan 16 14:53:28 2018 UTC ()
ruby*-base: Don't add SSP flags, leave that to pkgsrc.


(jperkin)
diff -r1.21 -r1.22 pkgsrc/lang/ruby22-base/distinfo
diff -r1.5 -r1.6 pkgsrc/lang/ruby22-base/patches/patch-configure
diff -r1.11 -r1.12 pkgsrc/lang/ruby23-base/distinfo
diff -r1.4 -r1.5 pkgsrc/lang/ruby23-base/patches/patch-configure
diff -r1.5 -r1.6 pkgsrc/lang/ruby24-base/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/ruby24-base/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/lang/ruby25-base/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/ruby25-base/patches/patch-configure
cvs diff -r1.21 -r1.22 pkgsrc/lang/ruby22-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby22-base/Attic/distinfo 2017/12/15 03:26:03 1.21
+++ pkgsrc/lang/ruby22-base/Attic/distinfo 2018/01/16 14:53:27 1.22
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.21 2017/12/15 03:26:03 taca Exp $ 1$NetBSD: distinfo,v 1.22 2018/01/16 14:53:27 jperkin Exp $
2 2
3SHA1 (ruby-2.2.9.tar.bz2) = 773ba9b51bde612866f656c4531f59660e2b0087 3SHA1 (ruby-2.2.9.tar.bz2) = 773ba9b51bde612866f656c4531f59660e2b0087
4RMD160 (ruby-2.2.9.tar.bz2) = 0973ec6a23ec909af7dec7c7152ca0a4e79fe959 4RMD160 (ruby-2.2.9.tar.bz2) = 0973ec6a23ec909af7dec7c7152ca0a4e79fe959
5SHA512 (ruby-2.2.9.tar.bz2) = 2a8c8770fda20a22b79c9115b6f468f8e7ea1092c84a5089af7a3122163e5ad298b493e6637e4d93ba02d899d8a619c94064dda8ac98cf3b93f64f45d5401085 5SHA512 (ruby-2.2.9.tar.bz2) = 2a8c8770fda20a22b79c9115b6f468f8e7ea1092c84a5089af7a3122163e5ad298b493e6637e4d93ba02d899d8a619c94064dda8ac98cf3b93f64f45d5401085
6Size (ruby-2.2.9.tar.bz2) = 13371232 bytes 6Size (ruby-2.2.9.tar.bz2) = 13371232 bytes
7SHA1 (patch-configure) = fda86ab23ec6291f3a51001793686904d4433b38 7SHA1 (patch-configure) = c3050191a117febacf65d0c798bf5a171fb19f05
8SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959 8SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959
9SHA1 (patch-ext_openssl_ossl__ssl.c) = e887a5576959921da116a5cee629c25610169593 9SHA1 (patch-ext_openssl_ossl__ssl.c) = e887a5576959921da116a5cee629c25610169593
10SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d 10SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d
11SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 11SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
12SHA1 (patch-lib_rubygems.rb) = 5b63c96109fa53fb072b6ae12bf91c4b2889e079 12SHA1 (patch-lib_rubygems.rb) = 5b63c96109fa53fb072b6ae12bf91c4b2889e079
13SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3e7003250d6241a4c4bf879de1b9fb3053cc10c7 13SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3e7003250d6241a4c4bf879de1b9fb3053cc10c7
14SHA1 (patch-lib_rubygems_config__file.rb) = 64cea598fa63433d432a5e5bcc85cdff96ed0f49 14SHA1 (patch-lib_rubygems_config__file.rb) = 64cea598fa63433d432a5e5bcc85cdff96ed0f49
15SHA1 (patch-lib_rubygems_defaults.rb) = 82d31b7deced68f2dd9e2c60cdc5c39bbfc9a900 15SHA1 (patch-lib_rubygems_defaults.rb) = 82d31b7deced68f2dd9e2c60cdc5c39bbfc9a900
16SHA1 (patch-lib_rubygems_dependency__installer.rb) = 33279f961cc4c530f0d81c8b415a79fdd26a1f84 16SHA1 (patch-lib_rubygems_dependency__installer.rb) = 33279f961cc4c530f0d81c8b415a79fdd26a1f84
17SHA1 (patch-lib_rubygems_install__update__options.rb) = 8ec3a2387f3a83e19d76b7a900ebf3b37bdcc043 17SHA1 (patch-lib_rubygems_install__update__options.rb) = 8ec3a2387f3a83e19d76b7a900ebf3b37bdcc043
18SHA1 (patch-lib_rubygems_installer.rb) = 864f3f8fe2949aedd85f730e447d8495f58d3b25 18SHA1 (patch-lib_rubygems_installer.rb) = 864f3f8fe2949aedd85f730e447d8495f58d3b25
19SHA1 (patch-lib_rubygems_platform.rb) = 2bddd029a2678de5a5d016af33f629caa712fbce 19SHA1 (patch-lib_rubygems_platform.rb) = 2bddd029a2678de5a5d016af33f629caa712fbce
20SHA1 (patch-lib_rubygems_specification.rb) = d84ff3d36295471bc7ba6823069c1c6a36cde293 20SHA1 (patch-lib_rubygems_specification.rb) = d84ff3d36295471bc7ba6823069c1c6a36cde293
cvs diff -r1.5 -r1.6 pkgsrc/lang/ruby22-base/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/ruby22-base/patches/Attic/patch-configure 2017/07/06 16:35:05 1.5
+++ pkgsrc/lang/ruby22-base/patches/Attic/patch-configure 2018/01/16 14:53:27 1.6
@@ -1,180 +1,189 @@ @@ -1,180 +1,189 @@
1$NetBSD: patch-configure,v 1.5 2017/07/06 16:35:05 taca Exp $ 1$NetBSD: patch-configure,v 1.6 2018/01/16 14:53:27 jperkin Exp $
2 2
3* Adding Interix support. 3* Adding Interix support.
4* Ignore doxygen. 4* Ignore doxygen.
5* Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose. 5* Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose.
 6* Handle SSP in pkgsrc.
6 7
7--- configure.orig 2017-03-28 07:53:45.000000000 +0000 8--- configure.orig 2017-12-14 16:00:13.000000000 +0000
8+++ configure 9+++ configure
9@@ -5581,7 +5581,7 @@ esac 10@@ -5581,7 +5581,7 @@ esac
10 else 11 else
11 if test x"$target_alias" = x; then 12 if test x"$target_alias" = x; then
12 case "$target_os" in #( 13 case "$target_os" in #(
13- darwin*) : 14- darwin*) :
14+ notdarwin*) : 15+ notdarwin*) :
15  16
16 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 17 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
17 $as_echo_n "checking for real target cpu... " >&6; } 18 $as_echo_n "checking for real target cpu... " >&6; }
18@@ -7456,6 +7456,7 @@ fi 19@@ -7456,6 +7456,7 @@ fi
19  20
20  21
21  22
22+: ${DLDFLAGS="$LDFLAGS"} 23+: ${DLDFLAGS="$LDFLAGS"}
23  24
24 case $RUBY_PATCHLEVEL in #( 25 case $RUBY_PATCHLEVEL in #(
25 -*) : 26 -*) :
26@@ -8909,6 +8910,10 @@ esac 27@@ -7796,6 +7797,7 @@ esac
 28 stack_protector=no
 29 ;; #(
 30 *) :
 31+ stack_protector=no
 32 ;;
 33 esac
 34 if test -z "${stack_protector+set}"; then
 35@@ -8909,6 +8911,10 @@ esac
27 LIBS="-lm $LIBS" 36 LIBS="-lm $LIBS"
28 ac_cv_func_round=no 37 ac_cv_func_round=no
29 ;; #( 38 ;; #(
30+ interix*) : 39+ interix*) :
31+ LIBS="-lm $LIBS" 40+ LIBS="-lm $LIBS"
32+ ac_cv_func_getpgrp_void=yes 41+ ac_cv_func_getpgrp_void=yes
33+ ;; #( 42+ ;; #(
34 nacl) : 43 nacl) :
35  44
36 LIBS="-lm $LIBS" 45 LIBS="-lm $LIBS"
37@@ -17004,6 +17009,8 @@ else 46@@ -17004,6 +17010,8 @@ else
38 # ifdef _MSC_VER 47 # ifdef _MSC_VER
39 # include <malloc.h> 48 # include <malloc.h>
40 # define alloca _alloca 49 # define alloca _alloca
41+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) 50+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
42+# include <stdlib.h> 51+# include <stdlib.h>
43 # else 52 # else
44 # ifdef HAVE_ALLOCA_H 53 # ifdef HAVE_ALLOCA_H
45 # include <alloca.h> 54 # include <alloca.h>
46@@ -21293,7 +21300,9 @@ esac ;; #( 55@@ -21293,7 +21301,9 @@ esac ;; #(
47 interix*) : 56 interix*) :
48 : ${LDSHARED='$(CC) -shared'} 57 : ${LDSHARED='$(CC) -shared'}
49 XLDFLAGS="$XLDFLAGS -Wl,-E" 58 XLDFLAGS="$XLDFLAGS -Wl,-E"
50+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' 59+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
51 LIBPATHFLAG=" -L%1\$-s" 60 LIBPATHFLAG=" -L%1\$-s"
52+ RPATHFLAG=' -Wl,-R%1$-s' 61+ RPATHFLAG=' -Wl,-R%1$-s'
53 rb_cv_dlopen=yes ;; #( 62 rb_cv_dlopen=yes ;; #(
54 freebsd*|dragonfly*) : 63 freebsd*|dragonfly*) :
55  64
56@@ -22503,7 +22512,17 @@ esac 65@@ -22503,7 +22513,17 @@ esac
57 ;; #( 66 ;; #(
58 linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu) : 67 linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu) :
59  68
60- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR" 69- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
61+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS) 70+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
62+ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' "$LDFLAGS_OPTDIR"; do 71+ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' "$LDFLAGS_OPTDIR"; do
63+ case " ${LIBRUBY_DLDFLAGS-} " in #( 72+ case " ${LIBRUBY_DLDFLAGS-} " in #(
64+ *" ${rb_opt} "*) : 73+ *" ${rb_opt} "*) :
65+ ;; #( 74+ ;; #(
66+ ' ') : 75+ ' ') :
67+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #( 76+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
68+ *) : 77+ *) :
69+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;; 78+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
70+esac 79+esac
71+ done 80+ done
72 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' 81 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
73 if test "$load_relative" = yes; then 82 if test "$load_relative" = yes; then
74 libprefix="'\$\${ORIGIN}/../${libdir_basename}'" 83 libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
75@@ -22514,7 +22533,7 @@ esac 84@@ -22514,7 +22534,7 @@ esac
76 freebsd*|dragonfly*) : 85 freebsd*|dragonfly*) :
77  86
78 SOLIBS='$(LIBS)' 87 SOLIBS='$(LIBS)'
79- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' 88- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
80+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' 89+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
81 if test "$rb_cv_binary_elf" != "yes" ; then 90 if test "$rb_cv_binary_elf" != "yes" ; then
82 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" 91 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
83 LIBRUBY_ALIASES='' 92 LIBRUBY_ALIASES=''
84@@ -22524,7 +22543,17 @@ esac 93@@ -22524,7 +22544,17 @@ esac
85  94
86 SOLIBS='$(LIBS)' 95 SOLIBS='$(LIBS)'
87 LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 96 LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
88- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'" $LDFLAGS_OPTDIR" 97- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'" $LDFLAGS_OPTDIR"
89+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS) 98+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
90+ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' "$LDFLAGS_OPTDIR"; do 99+ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' "$LDFLAGS_OPTDIR"; do
91+ case " ${LIBRUBY_DLDFLAGS-} " in #( 100+ case " ${LIBRUBY_DLDFLAGS-} " in #(
92+ *" ${rb_opt} "*) : 101+ *" ${rb_opt} "*) :
93+ ;; #( 102+ ;; #(
94+ ' ') : 103+ ' ') :
95+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #( 104+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
96+ *) : 105+ *) :
97+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;; 106+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
98+esac 107+esac
99+ done 108+ done
100 if test "$rb_cv_binary_elf" = yes; then # ELF platforms 109 if test "$rb_cv_binary_elf" = yes; then # ELF platforms
101 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 110 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
102 else # a.out platforms 111 else # a.out platforms
103@@ -22556,7 +22585,17 @@ esac 112@@ -22556,7 +22586,17 @@ esac
104 ;; #( 113 ;; #(
105 aix*) : 114 aix*) :
106  115
107- LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS $LDFLAGS_OPTDIR" 116- LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS $LDFLAGS_OPTDIR"
108+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS) 117+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
109+ for rb_opt in "${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"; do 118+ for rb_opt in "${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"; do
110+ case " ${LIBRUBY_DLDFLAGS-} " in #( 119+ case " ${LIBRUBY_DLDFLAGS-} " in #(
111+ *" ${rb_opt} "*) : 120+ *" ${rb_opt} "*) :
112+ ;; #( 121+ ;; #(
113+ ' ') : 122+ ' ') :
114+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #( 123+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
115+ *) : 124+ *) :
116+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;; 125+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
117+esac 126+esac
118+ done 127+ done
119 LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}' 128 LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
120 SOLIBS='-lm -lc' 129 SOLIBS='-lm -lc'
121 ;; #( 130 ;; #(
122@@ -22565,7 +22604,7 @@ esac 131@@ -22565,7 +22605,7 @@ esac
123 case "$target_cpu" in #( 132 case "$target_cpu" in #(
124 powerpc*) : 133 powerpc*) :
125  134
126- LIBRUBY_DLDFLAGS="-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR" 135- LIBRUBY_DLDFLAGS="-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR"
127+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS -f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR" 136+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS -f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR"
128 ;; #( 137 ;; #(
129 *) : 138 *) :
130 ;; 139 ;;
131@@ -22593,7 +22632,12 @@ esac 140@@ -22593,7 +22633,12 @@ esac
132 ;; #( 141 ;; #(
133 interix*) : 142 interix*) :
134  143
135- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' 144- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
136+ SOLIBS='$(LIBS)' 145+ SOLIBS='$(LIBS)'
137+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 146+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
138+ # link explicitly to 0x48000000 147+ # link explicitly to 0x48000000
139+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' 148+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
140+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' 149+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)'
141+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 150+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
142 ;; #( 151 ;; #(
143 mingw*|cygwin*|mswin*) : 152 mingw*|cygwin*|mswin*) :
144  153
145@@ -22766,7 +22810,7 @@ if test "$enable_rpath" = yes; then 154@@ -22766,7 +22811,7 @@ if test "$enable_rpath" = yes; then
146 esac 155 esac
147 rpathflag=`IFS="$PATH_SEPARATOR" 156 rpathflag=`IFS="$PATH_SEPARATOR"
148 echo x "$rpathflag" | 157 echo x "$rpathflag" |
149- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" 158- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g"
150+ sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" 159+ sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g"
151 ` 160 `
152 LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" 161 LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
153 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" 162 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
154@@ -23085,11 +23129,7 @@ if test "$install_doc" != no; then 163@@ -23085,11 +23130,7 @@ if test "$install_doc" != no; then
155 else 164 else
156 RDOCTARGET="nodoc" 165 RDOCTARGET="nodoc"
157 fi 166 fi
158- if test "$install_capi" != no -a -n "$DOXYGEN"; then 167- if test "$install_capi" != no -a -n "$DOXYGEN"; then
159- CAPITARGET="capi" 168- CAPITARGET="capi"
160- else 169- else
161- CAPITARGET="nodoc" 170- CAPITARGET="nodoc"
162- fi 171- fi
163+ CAPITARGET="nodoc" 172+ CAPITARGET="nodoc"
164 else 173 else
165 RDOCTARGET="nodoc" 174 RDOCTARGET="nodoc"
166 CAPITARGET="nodoc" 175 CAPITARGET="nodoc"
167@@ -25195,17 +25235,7 @@ which seems to be undefined. Please mak 176@@ -25195,17 +25236,7 @@ which seems to be undefined. Please mak
168 "Makefile":F) 177 "Makefile":F)
169 tmpmk=confmk$$.tmp 178 tmpmk=confmk$$.tmp
170 { 179 {
171- if test ${VCS+set}; then 180- if test ${VCS+set}; then
172- : 181- :
173- elif svn info "$srcdir" > /dev/null 2>&1; then 182- elif svn info "$srcdir" > /dev/null 2>&1; then
174- VCS='svn' 183- VCS='svn'
175- elif test -d "$srcdir/.git/svn"; then 184- elif test -d "$srcdir/.git/svn"; then
176- VCS='git svn' 185- VCS='git svn'
177- elif test -d "$srcdir/.git"; then 186- elif test -d "$srcdir/.git"; then
178- VCS='git' 187- VCS='git'
179- else 188- else
180- VCS='echo cannot' 189- VCS='echo cannot'
cvs diff -r1.11 -r1.12 pkgsrc/lang/ruby23-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby23-base/Attic/distinfo 2017/12/15 03:19:29 1.11
+++ pkgsrc/lang/ruby23-base/Attic/distinfo 2018/01/16 14:53:27 1.12
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.11 2017/12/15 03:19:29 taca Exp $ 1$NetBSD: distinfo,v 1.12 2018/01/16 14:53:27 jperkin Exp $
2 2
3SHA1 (ruby-2.3.6.tar.bz2) = 07c3b66d544dd22c22fbae3f16cfb3eeb88b7b1e 3SHA1 (ruby-2.3.6.tar.bz2) = 07c3b66d544dd22c22fbae3f16cfb3eeb88b7b1e
4RMD160 (ruby-2.3.6.tar.bz2) = 664e027a6f172212ac8ebff3aa9b99df4e99906b 4RMD160 (ruby-2.3.6.tar.bz2) = 664e027a6f172212ac8ebff3aa9b99df4e99906b
5SHA512 (ruby-2.3.6.tar.bz2) = bc3c7a115745a38e44bd91eb5637b1e412011c471d9749db7960185ef75737b944dd0e524f22432809649952ca7d93f46d458990e9cd2b0db5ca8abf4bc8ea99 5SHA512 (ruby-2.3.6.tar.bz2) = bc3c7a115745a38e44bd91eb5637b1e412011c471d9749db7960185ef75737b944dd0e524f22432809649952ca7d93f46d458990e9cd2b0db5ca8abf4bc8ea99
6Size (ruby-2.3.6.tar.bz2) = 14429114 bytes 6Size (ruby-2.3.6.tar.bz2) = 14429114 bytes
7SHA1 (patch-configure) = dbe68752f6458052ff89cb403a194eb3bd668f33 7SHA1 (patch-configure) = 90f18fa8a591a9b913d6b95bc55756ba913e6599
8SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b 8SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
9SHA1 (patch-ext_openssl_ossl__ssl.c) = 24e794aae278da6204e29212d9e2add0b0119ea4 9SHA1 (patch-ext_openssl_ossl__ssl.c) = 24e794aae278da6204e29212d9e2add0b0119ea4
10SHA1 (patch-lib_mkmf.rb) = d01302bac014ec1d72bbf19df64bc2c93c07ec5e 10SHA1 (patch-lib_mkmf.rb) = d01302bac014ec1d72bbf19df64bc2c93c07ec5e
11SHA1 (patch-lib_rdoc_ri_driver.rb) = bdbe04aa1dd1719d901233b16bcb318172a42b6c 11SHA1 (patch-lib_rdoc_ri_driver.rb) = bdbe04aa1dd1719d901233b16bcb318172a42b6c
12SHA1 (patch-lib_rubygems.rb) = d8968f54bdc973379675a3ebb5ca68325cff6644 12SHA1 (patch-lib_rubygems.rb) = d8968f54bdc973379675a3ebb5ca68325cff6644
13SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 7f5af0331a7e16f6c3ed472cf33ddaf762c5c4b2 13SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 7f5af0331a7e16f6c3ed472cf33ddaf762c5c4b2
14SHA1 (patch-lib_rubygems_config__file.rb) = 6c45b2adaa35284d32e5c3035d8435897bd22bda 14SHA1 (patch-lib_rubygems_config__file.rb) = 6c45b2adaa35284d32e5c3035d8435897bd22bda
15SHA1 (patch-lib_rubygems_defaults.rb) = 3a4bfa91441a7416d079e51719d7df646d1aa940 15SHA1 (patch-lib_rubygems_defaults.rb) = 3a4bfa91441a7416d079e51719d7df646d1aa940
16SHA1 (patch-lib_rubygems_dependency__installer.rb) = 91741a1836d3635d3b89dd7d775c3ae549f6363c 16SHA1 (patch-lib_rubygems_dependency__installer.rb) = 91741a1836d3635d3b89dd7d775c3ae549f6363c
17SHA1 (patch-lib_rubygems_install__update__options.rb) = 167cfeeb47842d20eaadd15ed89ea886cbfd33db 17SHA1 (patch-lib_rubygems_install__update__options.rb) = 167cfeeb47842d20eaadd15ed89ea886cbfd33db
18SHA1 (patch-lib_rubygems_installer.rb) = 37218b0ebf874095dce8b92bc30b5beb720e13a2 18SHA1 (patch-lib_rubygems_installer.rb) = 37218b0ebf874095dce8b92bc30b5beb720e13a2
19SHA1 (patch-lib_rubygems_platform.rb) = 244a6698636012235882ae606ae3a3b4dffd3faf 19SHA1 (patch-lib_rubygems_platform.rb) = 244a6698636012235882ae606ae3a3b4dffd3faf
20SHA1 (patch-lib_rubygems_specification.rb) = 46f517d6128d1366c0a302a7d04d2caec7ec948f 20SHA1 (patch-lib_rubygems_specification.rb) = 46f517d6128d1366c0a302a7d04d2caec7ec948f
cvs diff -r1.4 -r1.5 pkgsrc/lang/ruby23-base/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/ruby23-base/patches/Attic/patch-configure 2017/09/15 00:36:17 1.4
+++ pkgsrc/lang/ruby23-base/patches/Attic/patch-configure 2018/01/16 14:53:27 1.5
@@ -1,172 +1,181 @@ @@ -1,172 +1,181 @@
1$NetBSD: patch-configure,v 1.4 2017/09/15 00:36:17 taca Exp $ 1$NetBSD: patch-configure,v 1.5 2018/01/16 14:53:27 jperkin Exp $
2 2
3* Adding Interix support. 3* Adding Interix support.
4* Ignore doxygen. 4* Ignore doxygen.
5* Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose. 5* Pass LDFLAGS to LIBRUBY_DLDFLAGS via DLDFLAGS as Ruby 2.4 dose.
 6* Handle SSP in pkgsrc.
6 7
7--- configure.orig 2017-09-14 12:09:29.000000000 +0000 8--- configure.orig 2017-12-14 14:57:48.000000000 +0000
8+++ configure 9+++ configure
9@@ -5678,7 +5678,7 @@ esac 10@@ -5678,7 +5678,7 @@ esac
10 else 11 else
11 if test x"$target_alias" = x; then 12 if test x"$target_alias" = x; then
12 case "$target_os" in #( 13 case "$target_os" in #(
13- darwin*) : 14- darwin*) :
14+ notdarwin*) : 15+ notdarwin*) :
15  16
16 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 17 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
17 $as_echo_n "checking for real target cpu... " >&6; } 18 $as_echo_n "checking for real target cpu... " >&6; }
18@@ -7638,6 +7638,8 @@ else 19@@ -7638,6 +7638,8 @@ else
19  20
20 fi 21 fi
21  22
22+: ${DLDFLAGS="$LDFLAGS"} 23+: ${DLDFLAGS="$LDFLAGS"}
23+ 24+
24 case $RUBY_PATCHLEVEL in #( 25 case $RUBY_PATCHLEVEL in #(
25 -*) : 26 -*) :
26 particular_werror_flags=yes ;; #( 27 particular_werror_flags=yes ;; #(
27@@ -9319,6 +9321,10 @@ esac 28@@ -8024,6 +8026,7 @@ esac
 29 stack_protector=no
 30 ;; #(
 31 *) :
 32+ stack_protector=no
 33 ;;
 34 esac
 35 if test -z "${stack_protector+set}"; then
 36@@ -9319,6 +9322,10 @@ esac
28 LIBS="-lm $LIBS" 37 LIBS="-lm $LIBS"
29 ac_cv_func_round=no 38 ac_cv_func_round=no
30 ;; #( 39 ;; #(
31+ interix*) : 40+ interix*) :
32+ LIBS="-lm $LIBS" 41+ LIBS="-lm $LIBS"
33+ ac_cv_func_getpgrp_void=yes 42+ ac_cv_func_getpgrp_void=yes
34+ ;; #( 43+ ;; #(
35 nacl) : 44 nacl) :
36  45
37 LIBS="-lm $LIBS" 46 LIBS="-lm $LIBS"
38@@ -18065,6 +18071,8 @@ else 47@@ -18067,6 +18074,8 @@ else
39 # ifdef _MSC_VER 48 # ifdef _MSC_VER
40 # include <malloc.h> 49 # include <malloc.h>
41 # define alloca _alloca 50 # define alloca _alloca
42+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) 51+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
43+# include <stdlib.h> 52+# include <stdlib.h>
44 # else 53 # else
45 # ifdef HAVE_ALLOCA_H 54 # ifdef HAVE_ALLOCA_H
46 # include <alloca.h> 55 # include <alloca.h>
47@@ -22561,7 +22569,9 @@ esac ;; #( 56@@ -22563,7 +22572,9 @@ esac ;; #(
48 interix*) : 57 interix*) :
49 : ${LDSHARED='$(CC) -shared'} 58 : ${LDSHARED='$(CC) -shared'}
50 XLDFLAGS="$XLDFLAGS -Wl,-E" 59 XLDFLAGS="$XLDFLAGS -Wl,-E"
51+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' 60+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
52 LIBPATHFLAG=" -L%1\$-s" 61 LIBPATHFLAG=" -L%1\$-s"
53+ RPATHFLAG=' -Wl,-R%1$-s' 62+ RPATHFLAG=' -Wl,-R%1$-s'
54 rb_cv_dlopen=yes ;; #( 63 rb_cv_dlopen=yes ;; #(
55 freebsd*|dragonfly*) : 64 freebsd*|dragonfly*) :
56  65
57@@ -23667,7 +23677,17 @@ esac 66@@ -23669,7 +23680,17 @@ esac
58 ;; #( 67 ;; #(
59 linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*) : 68 linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*) :
60  69
61- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR" 70- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
62+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS) 71+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
63+ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' "$LDFLAGS_OPTDIR"; do 72+ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' "$LDFLAGS_OPTDIR"; do
64+ case " ${LIBRUBY_DLDFLAGS-} " in #( 73+ case " ${LIBRUBY_DLDFLAGS-} " in #(
65+ *" ${rb_opt} "*) : 74+ *" ${rb_opt} "*) :
66+ ;; #( 75+ ;; #(
67+ ' ') : 76+ ' ') :
68+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #( 77+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
69+ *) : 78+ *) :
70+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;; 79+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
71+esac 80+esac
72+ done 81+ done
73 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' 82 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
74 if test "$load_relative" = yes; then 83 if test "$load_relative" = yes; then
75 libprefix="'\$\${ORIGIN}/../${libdir_basename}'" 84 libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
76@@ -23678,7 +23698,7 @@ esac 85@@ -23680,7 +23701,7 @@ esac
77 freebsd*|dragonfly*) : 86 freebsd*|dragonfly*) :
78  87
79 SOLIBS='$(LIBS)' 88 SOLIBS='$(LIBS)'
80- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' 89- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
81+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' 90+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
82 if test "$rb_cv_binary_elf" != "yes" ; then 91 if test "$rb_cv_binary_elf" != "yes" ; then
83 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" 92 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
84 LIBRUBY_ALIASES='' 93 LIBRUBY_ALIASES=''
85@@ -23688,7 +23708,17 @@ esac 94@@ -23690,7 +23711,17 @@ esac
86  95
87 SOLIBS='$(LIBS)' 96 SOLIBS='$(LIBS)'
88 LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 97 LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
89- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'" $LDFLAGS_OPTDIR" 98- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'" $LDFLAGS_OPTDIR"
90+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS) 99+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
91+ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' "$LDFLAGS_OPTDIR"; do 100+ for rb_opt in '-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' "$LDFLAGS_OPTDIR"; do
92+ case " ${LIBRUBY_DLDFLAGS-} " in #( 101+ case " ${LIBRUBY_DLDFLAGS-} " in #(
93+ *" ${rb_opt} "*) : 102+ *" ${rb_opt} "*) :
94+ ;; #( 103+ ;; #(
95+ ' ') : 104+ ' ') :
96+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #( 105+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
97+ *) : 106+ *) :
98+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;; 107+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
99+esac 108+esac
100+ done 109+ done
101 if test "$rb_cv_binary_elf" = yes; then # ELF platforms 110 if test "$rb_cv_binary_elf" = yes; then # ELF platforms
102 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 111 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
103 else # a.out platforms 112 else # a.out platforms
104@@ -23720,7 +23750,17 @@ esac 113@@ -23722,7 +23753,17 @@ esac
105 ;; #( 114 ;; #(
106 aix*) : 115 aix*) :
107  116
108- LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS $LDFLAGS_OPTDIR" 117- LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS $LDFLAGS_OPTDIR"
109+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS) 118+ # RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS)
110+ for rb_opt in "${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"; do 119+ for rb_opt in "${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"; do
111+ case " ${LIBRUBY_DLDFLAGS-} " in #( 120+ case " ${LIBRUBY_DLDFLAGS-} " in #(
112+ *" ${rb_opt} "*) : 121+ *" ${rb_opt} "*) :
113+ ;; #( 122+ ;; #(
114+ ' ') : 123+ ' ') :
115+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #( 124+ LIBRUBY_DLDFLAGS="${rb_opt}" ;; #(
116+ *) : 125+ *) :
117+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;; 126+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS ${rb_opt}" ;;
118+esac 127+esac
119+ done 128+ done
120 LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}' 129 LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
121 SOLIBS='-lm -lc' 130 SOLIBS='-lm -lc'
122 ;; #( 131 ;; #(
123@@ -23747,7 +23787,12 @@ esac 132@@ -23749,7 +23790,12 @@ esac
124 ;; #( 133 ;; #(
125 interix*) : 134 interix*) :
126  135
127- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' 136- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
128+ SOLIBS='$(LIBS)' 137+ SOLIBS='$(LIBS)'
129+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 138+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
130+ # link explicitly to 0x48000000 139+ # link explicitly to 0x48000000
131+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' 140+ LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
132+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' 141+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)'
133+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 142+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
134 ;; #( 143 ;; #(
135 mingw*|cygwin*|mswin*) : 144 mingw*|cygwin*|mswin*) :
136  145
137@@ -23915,7 +23960,7 @@ if test "$enable_rpath" = yes; then 146@@ -23917,7 +23963,7 @@ if test "$enable_rpath" = yes; then
138 esac 147 esac
139 rpathflag=`IFS="$PATH_SEPARATOR" 148 rpathflag=`IFS="$PATH_SEPARATOR"
140 echo x "$rpathflag" | 149 echo x "$rpathflag" |
141- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" 150- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g"
142+ sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" 151+ sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g"
143 ` 152 `
144 LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" 153 LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
145 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" 154 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
146@@ -24306,11 +24351,7 @@ if test "$install_doc" != no; then 155@@ -24308,11 +24354,7 @@ if test "$install_doc" != no; then
147 else 156 else
148 RDOCTARGET="nodoc" 157 RDOCTARGET="nodoc"
149 fi 158 fi
150- if test "$install_capi" != no -a -n "$DOXYGEN"; then 159- if test "$install_capi" != no -a -n "$DOXYGEN"; then
151- CAPITARGET="capi" 160- CAPITARGET="capi"
152- else 161- else
153- CAPITARGET="nodoc" 162- CAPITARGET="nodoc"
154- fi 163- fi
155+ CAPITARGET="nodoc" 164+ CAPITARGET="nodoc"
156 else 165 else
157 RDOCTARGET="nodoc" 166 RDOCTARGET="nodoc"
158 CAPITARGET="nodoc" 167 CAPITARGET="nodoc"
159@@ -26329,17 +26370,7 @@ which seems to be undefined. Please mak 168@@ -26331,17 +26373,7 @@ which seems to be undefined. Please mak
160 "Makefile":F) 169 "Makefile":F)
161 tmpmk=confmk$$.tmp 170 tmpmk=confmk$$.tmp
162 { 171 {
163- if test ${VCS+set}; then 172- if test ${VCS+set}; then
164- : 173- :
165- elif svn info "$srcdir" > /dev/null 2>&1; then 174- elif svn info "$srcdir" > /dev/null 2>&1; then
166- VCS='svn' 175- VCS='svn'
167- elif test -d "$srcdir/.git/svn"; then 176- elif test -d "$srcdir/.git/svn"; then
168- VCS='git svn' 177- VCS='git svn'
169- elif test -d "$srcdir/.git"; then 178- elif test -d "$srcdir/.git"; then
170- VCS='git' 179- VCS='git'
171- else 180- else
172- VCS='echo cannot' 181- VCS='echo cannot'
cvs diff -r1.5 -r1.6 pkgsrc/lang/ruby24-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby24-base/Attic/distinfo 2017/12/15 03:23:29 1.5
+++ pkgsrc/lang/ruby24-base/Attic/distinfo 2018/01/16 14:53:28 1.6
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.5 2017/12/15 03:23:29 taca Exp $ 1$NetBSD: distinfo,v 1.6 2018/01/16 14:53:28 jperkin Exp $
2 2
3SHA1 (ruby-2.4.3.tar.bz2) = 3ca96536320b915762d57fe1ee540df6810bf631 3SHA1 (ruby-2.4.3.tar.bz2) = 3ca96536320b915762d57fe1ee540df6810bf631
4RMD160 (ruby-2.4.3.tar.bz2) = f02b5ca6b577351c8852a99eecaa4d4a3dda026f 4RMD160 (ruby-2.4.3.tar.bz2) = f02b5ca6b577351c8852a99eecaa4d4a3dda026f
5SHA512 (ruby-2.4.3.tar.bz2) = fb4339e30c04d03b1422b6c32ede45902e072cd26325b36f3fc05c341d42eea6431d88718242dcc9ce24d9cad26f3d26772f2e806bd7d93f40be50268c318409 5SHA512 (ruby-2.4.3.tar.bz2) = fb4339e30c04d03b1422b6c32ede45902e072cd26325b36f3fc05c341d42eea6431d88718242dcc9ce24d9cad26f3d26772f2e806bd7d93f40be50268c318409
6Size (ruby-2.4.3.tar.bz2) = 12615068 bytes 6Size (ruby-2.4.3.tar.bz2) = 12615068 bytes
7SHA1 (patch-configure) = 680a13e6405a8aab61eba078f6d88488b426885c 7SHA1 (patch-configure) = 8efaac42f4441c1ea8075c1a0272b08f24c67bed
8SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b 8SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
9SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e 9SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e
10SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198 10SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198
11SHA1 (patch-lib_rubygems.rb) = 1a5aa56308cff986ab8e65f523f8d19649ddf24c 11SHA1 (patch-lib_rubygems.rb) = 1a5aa56308cff986ab8e65f523f8d19649ddf24c
12SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3d3495f616f11d009d6d36bb40e472bb010bce06 12SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3d3495f616f11d009d6d36bb40e472bb010bce06
13SHA1 (patch-lib_rubygems_config__file.rb) = 6da2775ee1ba96a1e5a77878f0e7825c072a1121 13SHA1 (patch-lib_rubygems_config__file.rb) = 6da2775ee1ba96a1e5a77878f0e7825c072a1121
14SHA1 (patch-lib_rubygems_defaults.rb) = dfe70f128bd824509b37174deccd8908e3a0d6ee 14SHA1 (patch-lib_rubygems_defaults.rb) = dfe70f128bd824509b37174deccd8908e3a0d6ee
15SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76 15SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76
16SHA1 (patch-lib_rubygems_install__update__options.rb) = bc6fa63ec1548692bbf5ef38b44dbaf5b2174908 16SHA1 (patch-lib_rubygems_install__update__options.rb) = bc6fa63ec1548692bbf5ef38b44dbaf5b2174908
17SHA1 (patch-lib_rubygems_installer.rb) = 7a9cfbd5d05c8901132d2bbf4555efa05e6363ec 17SHA1 (patch-lib_rubygems_installer.rb) = 7a9cfbd5d05c8901132d2bbf4555efa05e6363ec
18SHA1 (patch-lib_rubygems_platform.rb) = a208bf6bce28a687511bace5ff8a773fb6bcf87d 18SHA1 (patch-lib_rubygems_platform.rb) = a208bf6bce28a687511bace5ff8a773fb6bcf87d
19SHA1 (patch-lib_rubygems_specification.rb) = e2ef2e6de4838168d11efef92f65d87d22c65ae4 19SHA1 (patch-lib_rubygems_specification.rb) = e2ef2e6de4838168d11efef92f65d87d22c65ae4
20SHA1 (patch-man_erb.1) = 2ae8a0400974922d6a637648ed0da2fedee98ed0 20SHA1 (patch-man_erb.1) = 2ae8a0400974922d6a637648ed0da2fedee98ed0
cvs diff -r1.2 -r1.3 pkgsrc/lang/ruby24-base/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/ruby24-base/patches/Attic/patch-configure 2017/06/27 15:25:19 1.2
+++ pkgsrc/lang/ruby24-base/patches/Attic/patch-configure 2018/01/16 14:53:28 1.3
@@ -1,115 +1,124 @@ @@ -1,115 +1,124 @@
1$NetBSD: patch-configure,v 1.2 2017/06/27 15:25:19 jperkin Exp $ 1$NetBSD: patch-configure,v 1.3 2018/01/16 14:53:28 jperkin Exp $
2 2
3* Adding Interix support. 3* Adding Interix support.
4* Ignore doxygen. 4* Ignore doxygen.
5* Ignore VCS. 5* Ignore VCS.
 6* Handle SSP in pkgsrc.
6 7
7--- configure.orig 2017-03-22 05:56:10.000000000 +0000 8--- configure.orig 2017-12-14 14:36:11.000000000 +0000
8+++ configure 9+++ configure
9@@ -5727,7 +5727,7 @@ esac 10@@ -5727,7 +5727,7 @@ esac
10 else 11 else
11 if test x"$target_alias" = x; then 12 if test x"$target_alias" = x; then
12 case "$target_os" in #( 13 case "$target_os" in #(
13- darwin*) : 14- darwin*) :
14+ notdarwin*) : 15+ notdarwin*) :
15  16
16 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 17 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
17 $as_echo_n "checking for real target cpu... " >&6; } 18 $as_echo_n "checking for real target cpu... " >&6; }
18@@ -9234,7 +9234,7 @@ rm -f core conftest.err conftest.$ac_obj 19@@ -8112,6 +8112,7 @@ esac
 20 stack_protector=no
 21 ;; #(
 22 *) :
 23+ stack_protector=no
 24 ;;
 25 esac
 26 if test -z "${stack_protector+set}"; then
 27@@ -9325,7 +9326,7 @@ rm -f core conftest.err conftest.$ac_obj
19 # is often also needed in CPPFLAGS, because some feature 28 # is often also needed in CPPFLAGS, because some feature
20 # definitions vary depending on such standards options. 29 # definitions vary depending on such standards options.
21 case "${ansi_options}" in #( 30 case "${ansi_options}" in #(
22- *-std=iso9899:1999*) : 31- *-std=iso9899:1999*) :
23+ *-std=iso9899:1999*|*-std=gnu99*) : 32+ *-std=iso9899:1999*|*-std=gnu99*) :
24  33
25 # RUBY_APPEND_OPTIONS(CPPFLAGS) 34 # RUBY_APPEND_OPTIONS(CPPFLAGS)
26 for rb_opt in ${ansi_options}; do 35 for rb_opt in ${ansi_options}; do
27@@ -9464,6 +9464,10 @@ esac 36@@ -9555,6 +9556,10 @@ esac
28 LIBS="-lm $LIBS" 37 LIBS="-lm $LIBS"
29 ac_cv_func_round=no 38 ac_cv_func_round=no
30 ;; #( 39 ;; #(
31+ interix*) : 40+ interix*) :
32+ LIBS="-lm $LIBS" 41+ LIBS="-lm $LIBS"
33+ ac_cv_func_getpgrp_void=yes 42+ ac_cv_func_getpgrp_void=yes
34+ ;; #( 43+ ;; #(
35 nacl) : 44 nacl) :
36  45
37 LIBS="-lm $LIBS" 46 LIBS="-lm $LIBS"
38@@ -19697,6 +19701,8 @@ else 47@@ -19808,6 +19813,8 @@ else
39 # ifdef _MSC_VER 48 # ifdef _MSC_VER
40 # include <malloc.h> 49 # include <malloc.h>
41 # define alloca _alloca 50 # define alloca _alloca
42+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) 51+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
43+# include <stdlib.h> 52+# include <stdlib.h>
44 # else 53 # else
45 # ifdef HAVE_ALLOCA_H 54 # ifdef HAVE_ALLOCA_H
46 # include <alloca.h> 55 # include <alloca.h>
47@@ -24383,7 +24389,9 @@ esac ;; #( 56@@ -24490,7 +24497,9 @@ esac ;; #(
48 interix*) : 57 interix*) :
49 : ${LDSHARED='$(CC) -shared'} 58 : ${LDSHARED='$(CC) -shared'}
50 XLDFLAGS="$XLDFLAGS -Wl,-E" 59 XLDFLAGS="$XLDFLAGS -Wl,-E"
51+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' 60+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
52 LIBPATHFLAG=" -L%1\$-s" 61 LIBPATHFLAG=" -L%1\$-s"
53+ RPATHFLAG=' -Wl,-R%1$-s' 62+ RPATHFLAG=' -Wl,-R%1$-s'
54 rb_cv_dlopen=yes ;; #( 63 rb_cv_dlopen=yes ;; #(
55 freebsd*|dragonfly*) : 64 freebsd*|dragonfly*) :
56  65
57@@ -25571,7 +25579,7 @@ esac 66@@ -25617,7 +25626,7 @@ esac
58 freebsd*|dragonfly*) : 67 freebsd*|dragonfly*) :
59  68
60 SOLIBS='$(LIBS)' 69 SOLIBS='$(LIBS)'
61- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' 70- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
62+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' 71+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
63 if test "$rb_cv_binary_elf" != "yes" ; then 72 if test "$rb_cv_binary_elf" != "yes" ; then
64 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" 73 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
65 LIBRUBY_ALIASES='' 74 LIBRUBY_ALIASES=''
66@@ -25660,7 +25668,12 @@ esac 75@@ -25706,7 +25715,12 @@ esac
67 ;; #( 76 ;; #(
68 interix*) : 77 interix*) :
69  78
70- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' 79- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
71+ SOLIBS='$(LIBS)' 80+ SOLIBS='$(LIBS)'
72+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 81+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
73+ # link explicitly to 0x48000000 82+ # link explicitly to 0x48000000
74+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' 83+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
75+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' 84+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)'
76+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 85+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
77 ;; #( 86 ;; #(
78 mingw*|cygwin*|mswin*) : 87 mingw*|cygwin*|mswin*) :
79  88
80@@ -25828,7 +25841,7 @@ if test "$enable_rpath" = yes; then 89@@ -25874,7 +25888,7 @@ if test "$enable_rpath" = yes; then
81 esac 90 esac
82 rpathflag=`IFS="$PATH_SEPARATOR" 91 rpathflag=`IFS="$PATH_SEPARATOR"
83 echo x "$rpathflag" | 92 echo x "$rpathflag" |
84- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" 93- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g"
85+ sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" 94+ sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g"
86 ` 95 `
87 LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" 96 LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
88 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" 97 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
89@@ -26324,11 +26337,7 @@ if test "$install_doc" != no; then 98@@ -26370,11 +26384,7 @@ if test "$install_doc" != no; then
90 else 99 else
91 RDOCTARGET="nodoc" 100 RDOCTARGET="nodoc"
92 fi 101 fi
93- if test "$install_capi" != no -a -n "$DOXYGEN"; then 102- if test "$install_capi" != no -a -n "$DOXYGEN"; then
94- CAPITARGET="capi" 103- CAPITARGET="capi"
95- else 104- else
96- CAPITARGET="nodoc" 105- CAPITARGET="nodoc"
97- fi 106- fi
98+ CAPITARGET="nodoc" 107+ CAPITARGET="nodoc"
99 else 108 else
100 RDOCTARGET="nodoc" 109 RDOCTARGET="nodoc"
101 CAPITARGET="nodoc" 110 CAPITARGET="nodoc"
102@@ -28372,19 +28383,7 @@ which seems to be undefined. Please mak 111@@ -28404,19 +28414,7 @@ which seems to be undefined. Please mak
103 "Makefile":F) 112 "Makefile":F)
104 tmpmk=confmk$$.tmp 113 tmpmk=confmk$$.tmp
105 { 114 {
106- if test ${VCS+set}; then 115- if test ${VCS+set}; then
107- : 116- :
108- elif svn info "$srcdir" > /dev/null 2>&1; then 117- elif svn info "$srcdir" > /dev/null 2>&1; then
109- VCS='svn' 118- VCS='svn'
110- elif git_dir=`git --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then 119- elif git_dir=`git --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then
111- if test -d "$git_dir/svn"; then 120- if test -d "$git_dir/svn"; then
112- VCS='git svn' 121- VCS='git svn'
113- else 122- else
114- VCS='git' 123- VCS='git'
115- fi 124- fi
cvs diff -r1.1 -r1.2 pkgsrc/lang/ruby25-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby25-base/Attic/distinfo 2018/01/08 14:19:06 1.1
+++ pkgsrc/lang/ruby25-base/Attic/distinfo 2018/01/16 14:53:28 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.1 2018/01/08 14:19:06 taca Exp $ 1$NetBSD: distinfo,v 1.2 2018/01/16 14:53:28 jperkin Exp $
2 2
3SHA1 (ruby-2.5.0.tar.bz2) = 827b9a3bcffa86d1fc9ed96d403cb9dc37731688 3SHA1 (ruby-2.5.0.tar.bz2) = 827b9a3bcffa86d1fc9ed96d403cb9dc37731688
4RMD160 (ruby-2.5.0.tar.bz2) = e09d8b3f89d3b494231026cf1295c5bf5da794e5 4RMD160 (ruby-2.5.0.tar.bz2) = e09d8b3f89d3b494231026cf1295c5bf5da794e5
5SHA512 (ruby-2.5.0.tar.bz2) = 8f6fdf6708e7470f55bc009db2567cd8d4e633ad0678d83a015441ecf5b5d88bd7da8fb8533a42157ff83b74d00b6dc617d39bbb17fc2c6c12287a1d8eaa0f2c 5SHA512 (ruby-2.5.0.tar.bz2) = 8f6fdf6708e7470f55bc009db2567cd8d4e633ad0678d83a015441ecf5b5d88bd7da8fb8533a42157ff83b74d00b6dc617d39bbb17fc2c6c12287a1d8eaa0f2c
6Size (ruby-2.5.0.tar.bz2) = 13955820 bytes 6Size (ruby-2.5.0.tar.bz2) = 13955820 bytes
7SHA1 (patch-configure) = 8e997449685b8454c8c7281a3492d287b2ed3e5c 7SHA1 (patch-configure) = 347bdd41a2529cfe77ffbe053a6941756dffe694
8SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b 8SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
9SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e 9SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e
10SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198 10SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198
11SHA1 (patch-lib_rubygems.rb) = 1a5aa56308cff986ab8e65f523f8d19649ddf24c 11SHA1 (patch-lib_rubygems.rb) = 1a5aa56308cff986ab8e65f523f8d19649ddf24c
12SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3d3495f616f11d009d6d36bb40e472bb010bce06 12SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3d3495f616f11d009d6d36bb40e472bb010bce06
13SHA1 (patch-lib_rubygems_config__file.rb) = 6da2775ee1ba96a1e5a77878f0e7825c072a1121 13SHA1 (patch-lib_rubygems_config__file.rb) = 6da2775ee1ba96a1e5a77878f0e7825c072a1121
14SHA1 (patch-lib_rubygems_defaults.rb) = dfe70f128bd824509b37174deccd8908e3a0d6ee 14SHA1 (patch-lib_rubygems_defaults.rb) = dfe70f128bd824509b37174deccd8908e3a0d6ee
15SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76 15SHA1 (patch-lib_rubygems_dependency__installer.rb) = 1776508907f17547ffe93f637d6f18d335061d76
16SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3 16SHA1 (patch-lib_rubygems_install__update__options.rb) = 1e953b5a517a805fd7184e359fbc06e67a5ff9b3
17SHA1 (patch-lib_rubygems_installer.rb) = 7a9cfbd5d05c8901132d2bbf4555efa05e6363ec 17SHA1 (patch-lib_rubygems_installer.rb) = 7a9cfbd5d05c8901132d2bbf4555efa05e6363ec
18SHA1 (patch-lib_rubygems_platform.rb) = a208bf6bce28a687511bace5ff8a773fb6bcf87d 18SHA1 (patch-lib_rubygems_platform.rb) = a208bf6bce28a687511bace5ff8a773fb6bcf87d
19SHA1 (patch-lib_rubygems_specification.rb) = e2ef2e6de4838168d11efef92f65d87d22c65ae4 19SHA1 (patch-lib_rubygems_specification.rb) = e2ef2e6de4838168d11efef92f65d87d22c65ae4
20SHA1 (patch-test_rubygems_test__gem.rb) = 80d646b95df81bacca6d277d2801dba16df291f5 20SHA1 (patch-test_rubygems_test__gem.rb) = 80d646b95df81bacca6d277d2801dba16df291f5
cvs diff -r1.1 -r1.2 pkgsrc/lang/ruby25-base/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/ruby25-base/patches/Attic/patch-configure 2018/01/08 14:19:06 1.1
+++ pkgsrc/lang/ruby25-base/patches/Attic/patch-configure 2018/01/16 14:53:28 1.2
@@ -1,119 +1,128 @@ @@ -1,119 +1,128 @@
1$NetBSD: patch-configure,v 1.1 2018/01/08 14:19:06 taca Exp $ 1$NetBSD: patch-configure,v 1.2 2018/01/16 14:53:28 jperkin Exp $
2 2
3* Adding Interix support. 3* Adding Interix support.
4* Ignore doxygen. 4* Ignore doxygen.
5* Ignore VCS. 5* Ignore VCS.
 6* Handle SSP in pkgsrc.
6 7
7--- configure.orig 2017-12-25 07:00:28.000000000 +0000 8--- configure.orig 2017-12-25 07:00:28.000000000 +0000
8+++ configure 9+++ configure
9@@ -5428,7 +5428,7 @@ else 10@@ -5428,7 +5428,7 @@ else
10 if test x"$target_alias" = x; then : 11 if test x"$target_alias" = x; then :
11  12
12 case "$target_os" in #( 13 case "$target_os" in #(
13- darwin*) : 14- darwin*) :
14+ nodarwin*) : 15+ nodarwin*) :
15  16
16 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 17 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
17 $as_echo_n "checking for real target cpu... " >&6; } 18 $as_echo_n "checking for real target cpu... " >&6; }
18@@ -9295,7 +9295,7 @@ rm -f core conftest.err conftest.$ac_obj 19@@ -7873,6 +7873,7 @@ fi
 20 stack_protector=no
 21 ;; #(
 22 *) :
 23+ stack_protector=no
 24 ;;
 25 esac
 26 if test -z "${stack_protector+set}"; then :
 27@@ -9295,7 +9296,7 @@ rm -f core conftest.err conftest.$ac_obj
19 # is often also needed in CPPFLAGS, because some feature 28 # is often also needed in CPPFLAGS, because some feature
20 # definitions vary depending on such standards options. 29 # definitions vary depending on such standards options.
21 case "${ansi_options}" in #( 30 case "${ansi_options}" in #(
22- *-std=iso9899:1999*) : 31- *-std=iso9899:1999*) :
23+ *-std=iso9899:1999*|*-std=gnu99*) : 32+ *-std=iso9899:1999*|*-std=gnu99*) :
24  33
25 # RUBY_APPEND_OPTIONS(CPPFLAGS) 34 # RUBY_APPEND_OPTIONS(CPPFLAGS)
26 for rb_opt in ${ansi_options}; do 35 for rb_opt in ${ansi_options}; do
27@@ -9536,6 +9536,10 @@ esac 36@@ -9536,6 +9537,10 @@ esac
28 LIBS="-lm $LIBS" 37 LIBS="-lm $LIBS"
29 ac_cv_func_round=no 38 ac_cv_func_round=no
30 ;; #( 39 ;; #(
31+ interix*) : 40+ interix*) :
32+ LIBS="-lm $LIBS" 41+ LIBS="-lm $LIBS"
33+ ac_cv_func_getpgrp_void=yes 42+ ac_cv_func_getpgrp_void=yes
34+ ;; #( 43+ ;; #(
35 *) : 44 *) :
36 LIBS="-lm $LIBS" ;; 45 LIBS="-lm $LIBS" ;;
37 esac 46 esac
38@@ -20224,6 +20228,8 @@ else 47@@ -20224,6 +20229,8 @@ else
39 # ifdef _MSC_VER 48 # ifdef _MSC_VER
40 # include <malloc.h> 49 # include <malloc.h>
41 # define alloca _alloca 50 # define alloca _alloca
42+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) 51+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
43+# include <stdlib.h> 52+# include <stdlib.h>
44 # else 53 # else
45 # ifdef HAVE_ALLOCA_H 54 # ifdef HAVE_ALLOCA_H
46 # include <alloca.h> 55 # include <alloca.h>
47@@ -24996,7 +25002,9 @@ fi 56@@ -24996,7 +25003,9 @@ fi
48 interix*) : 57 interix*) :
49 : ${LDSHARED='$(CC) -shared'} 58 : ${LDSHARED='$(CC) -shared'}
50 XLDFLAGS="$XLDFLAGS -Wl,-E" 59 XLDFLAGS="$XLDFLAGS -Wl,-E"
51+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' 60+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
52 LIBPATHFLAG=" -L%1\$-s" 61 LIBPATHFLAG=" -L%1\$-s"
53+ RPATHFLAG=' -Wl,-R%1$-s' 62+ RPATHFLAG=' -Wl,-R%1$-s'
54 rb_cv_dlopen=yes ;; #( 63 rb_cv_dlopen=yes ;; #(
55 freebsd*|dragonfly*) : 64 freebsd*|dragonfly*) :
56  65
57@@ -26229,7 +26237,7 @@ fi 66@@ -26229,7 +26238,7 @@ fi
58 freebsd*|dragonfly*) : 67 freebsd*|dragonfly*) :
59  68
60 SOLIBS='$(LIBS)' 69 SOLIBS='$(LIBS)'
61- LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' 70- LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
62+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' 71+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
63 LIBRUBY_SONAME='$(LIBRUBY_SO)' 72 LIBRUBY_SONAME='$(LIBRUBY_SO)'
64 if test "$rb_cv_binary_elf" != "yes" ; then : 73 if test "$rb_cv_binary_elf" != "yes" ; then :
65  74
66@@ -26334,7 +26342,12 @@ fi 75@@ -26334,7 +26343,12 @@ fi
67 ;; #( 76 ;; #(
68 interix*) : 77 interix*) :
69  78
70- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' 79- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
71+ SOLIBS='$(LIBS)' 80+ SOLIBS='$(LIBS)'
72+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 81+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
73+ # link explicitly to 0x48000000 82+ # link explicitly to 0x48000000
74+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' 83+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
75+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' 84+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)'
76+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 85+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
77 ;; #( 86 ;; #(
78 mingw*|cygwin*|mswin*) : 87 mingw*|cygwin*|mswin*) :
79  88
80@@ -26516,7 +26529,7 @@ if test "$enable_rpath" = yes; then : 89@@ -26516,7 +26530,7 @@ if test "$enable_rpath" = yes; then :
81 esac 90 esac
82 rpathflag=`IFS="$PATH_SEPARATOR" 91 rpathflag=`IFS="$PATH_SEPARATOR"
83 echo x "$rpathflag" | 92 echo x "$rpathflag" |
84- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" 93- sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g"
85+ sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" 94+ sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g"
86 ` 95 `
87 LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" 96 LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
88 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" 97 LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
89@@ -27058,15 +27071,7 @@ fi 98@@ -27058,15 +27072,7 @@ fi
90  99
91 if test "$install_doc" != no; then : 100 if test "$install_doc" != no; then :
92  101
93- if test "$install_rdoc" != no; then : 102- if test "$install_rdoc" != no; then :
94- 103-
95- RDOCTARGET="rdoc" 104- RDOCTARGET="rdoc"
96- 105-
97-else 106-else
98- 107-
99- RDOCTARGET="nodoc" 108- RDOCTARGET="nodoc"
100- 109-
101-fi 110-fi
102+ RDOCTARGET="nodoc" 111+ RDOCTARGET="nodoc"
103 if test "$install_capi" != no -a -n "$DOXYGEN"; then : 112 if test "$install_capi" != no -a -n "$DOXYGEN"; then :
104  113
105 CAPITARGET="capi" 114 CAPITARGET="capi"
106@@ -29143,31 +29148,7 @@ which seems to be undefined. Please mak 115@@ -29143,31 +29149,7 @@ which seems to be undefined. Please mak
107 "Makefile":F) 116 "Makefile":F)
108 tmpmk=confmk$$.tmp 117 tmpmk=confmk$$.tmp
109 { 118 {
110- if test ${VCS+set}; then : 119- if test ${VCS+set}; then :
111- 120-
112- : 121- :
113- 122-
114-elif svn info "$srcdir" > /dev/null 2>&1; then : 123-elif svn info "$srcdir" > /dev/null 2>&1; then :
115- 124-
116- VCS='svn' 125- VCS='svn'
117- 126-
118-elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then : 127-elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then :
119- 128-