Wed Feb 6 15:48:31 2013 UTC ()
Update ruby193 pacakges to 1.9.3p385.

This release includes a security fix about bundled RDoc.
Full changes are too may to write here, please refer ChangeLog.


(taca)
diff -r1.93 -r1.94 pkgsrc/lang/ruby/rubyversion.mk
diff -r1.22 -r1.23 pkgsrc/lang/ruby193-base/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/ruby193-base/PLIST
diff -r1.15 -r1.16 pkgsrc/lang/ruby193-base/distinfo
diff -r1.5 -r1.6 pkgsrc/lang/ruby193-base/patches/patch-configure
cvs diff -r1.93 -r1.94 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2013/01/31 15:56:13 1.93
+++ pkgsrc/lang/ruby/rubyversion.mk 2013/02/06 15:48:30 1.94
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rubyversion.mk,v 1.93 2013/01/31 15:56:13 taca Exp $ 1# $NetBSD: rubyversion.mk,v 1.94 2013/02/06 15:48:30 taca Exp $
2# 2#
3 3
4# This file determines which Ruby version is used as a dependency for 4# This file determines which Ruby version is used as a dependency for
5# a package. 5# a package.
6# 6#
7# 7#
8# === User-settable variables === 8# === User-settable variables ===
9# 9#
10# RUBY_VERSION_DEFAULT 10# RUBY_VERSION_DEFAULT
11# The preferered Ruby version to use. 11# The preferered Ruby version to use.
12# 12#
13# Possible values: 18 193 13# Possible values: 18 193
14# Default: 193 14# Default: 193
@@ -196,27 +196,27 @@ @@ -196,27 +196,27 @@
196# 196#
197 197
198.if !defined(_RUBYVERSION_MK) 198.if !defined(_RUBYVERSION_MK)
199_RUBYVERSION_MK= # defined 199_RUBYVERSION_MK= # defined
200 200
201.include "../../mk/bsd.prefs.mk" 201.include "../../mk/bsd.prefs.mk"
202 202
203# current supported Ruby's version 203# current supported Ruby's version
204RUBY18_VERSION= 1.8.7 204RUBY18_VERSION= 1.8.7
205RUBY193_VERSION= 1.9.3 205RUBY193_VERSION= 1.9.3
206 206
207# patch 207# patch
208RUBY18_PATCHLEVEL= pl371 208RUBY18_PATCHLEVEL= pl371
209RUBY193_PATCHLEVEL= p374 209RUBY193_PATCHLEVEL= p385
210 210
211# current API compatible version; used for version of shared library 211# current API compatible version; used for version of shared library
212RUBY18_API_VERSION= 1.8.7 212RUBY18_API_VERSION= 1.8.7
213RUBY193_API_VERSION= 1.9.1 213RUBY193_API_VERSION= 1.9.1
214 214
215# 215#
216RUBY_VERSION_DEFAULT?= 193 216RUBY_VERSION_DEFAULT?= 193
217 217
218RUBY_VERSION_SUPPORTED?= 193 18 218RUBY_VERSION_SUPPORTED?= 193 18
219RUBY_VER?= ${RUBY_VERSION_DEFAULT} 219RUBY_VER?= ${RUBY_VERSION_DEFAULT}
220 220
221# If package support only one version, use it. 221# If package support only one version, use it.
222.if ${RUBY_VERSION_SUPPORTED:[\#]} == 1 222.if ${RUBY_VERSION_SUPPORTED:[\#]} == 1
cvs diff -r1.22 -r1.23 pkgsrc/lang/ruby193-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/Attic/Makefile 2013/02/02 08:11:53 1.22
+++ pkgsrc/lang/ruby193-base/Attic/Makefile 2013/02/06 15:48:31 1.23
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.22 2013/02/02 08:11:53 taca Exp $ 1# $NetBSD: Makefile,v 1.23 2013/02/06 15:48:31 taca Exp $
2# 2#
3 3
4DISTNAME= ${RUBY_DISTNAME} 4DISTNAME= ${RUBY_DISTNAME}
5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} 5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
6PKGREVISION= 1 
7CATEGORIES= lang ruby 6CATEGORIES= lang ruby
8MASTER_SITES= ${MASTER_SITE_RUBY} 7MASTER_SITES= ${MASTER_SITE_RUBY}
9 8
10MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
11HOMEPAGE= ${RUBY_HOMEPAGE} 10HOMEPAGE= ${RUBY_HOMEPAGE}
12COMMENT= Ruby ${RUBY_VERSION} release minimum base package 11COMMENT= Ruby ${RUBY_VERSION} release minimum base package
13LICENSE= ${RUBY_LICENSE} 12LICENSE= ${RUBY_LICENSE}
14 13
15RUBY_VERSION_SUPPORTED= 193 14RUBY_VERSION_SUPPORTED= 193
16 15
17MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
18USE_LANGUAGES= c 17USE_LANGUAGES= c
19USE_TOOLS+= pax yacc 18USE_TOOLS+= pax yacc
cvs diff -r1.5 -r1.6 pkgsrc/lang/ruby193-base/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/Attic/PLIST 2013/01/31 15:56:14 1.5
+++ pkgsrc/lang/ruby193-base/Attic/PLIST 2013/02/06 15:48:31 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2013/01/31 15:56:14 taca Exp $ 1@comment $NetBSD: PLIST,v 1.6 2013/02/06 15:48:31 taca Exp $
2bin/erb${RUBY_VER} 2bin/erb${RUBY_VER}
3bin/gem${RUBY_VER} 3bin/gem${RUBY_VER}
4bin/irb${RUBY_VER} 4bin/irb${RUBY_VER}
5bin/rake${RUBY_VER} 5bin/rake${RUBY_VER}
6bin/rdoc${RUBY_VER} 6bin/rdoc${RUBY_VER}
7bin/ri${RUBY_VER} 7bin/ri${RUBY_VER}
8bin/${RUBY_NAME} 8bin/${RUBY_NAME}
9bin/testrb${RUBY_VER} 9bin/testrb${RUBY_VER}
10${RUBY_ARCHINC}/ruby/config.h 10${RUBY_ARCHINC}/ruby/config.h
11${RUBY_INC}/ruby.h 11${RUBY_INC}/ruby.h
12${RUBY_INC}/ruby/backward/classext.h 12${RUBY_INC}/ruby/backward/classext.h
13${RUBY_INC}/ruby/backward/rubyio.h 13${RUBY_INC}/ruby/backward/rubyio.h
14${RUBY_INC}/ruby/backward/rubysig.h 14${RUBY_INC}/ruby/backward/rubysig.h
@@ -760,34 +760,34 @@ ${RUBY_ARCHLIB}/pathname.${RUBY_DLEXT} @@ -760,34 +760,34 @@ ${RUBY_ARCHLIB}/pathname.${RUBY_DLEXT}
760${RUBY_ARCHLIB}/psych.${RUBY_DLEXT} 760${RUBY_ARCHLIB}/psych.${RUBY_DLEXT}
761${RUBY_ARCHLIB}/pty.${RUBY_DLEXT} 761${RUBY_ARCHLIB}/pty.${RUBY_DLEXT}
762${RUBY_ARCHLIB}/racc/cparse.${RUBY_DLEXT} 762${RUBY_ARCHLIB}/racc/cparse.${RUBY_DLEXT}
763${RUBY_ARCHLIB}/rbconfig.rb 763${RUBY_ARCHLIB}/rbconfig.rb
764${RUBY_ARCHLIB}/ripper.${RUBY_DLEXT} 764${RUBY_ARCHLIB}/ripper.${RUBY_DLEXT}
765${RUBY_ARCHLIB}/sdbm.${RUBY_DLEXT} 765${RUBY_ARCHLIB}/sdbm.${RUBY_DLEXT}
766${RUBY_ARCHLIB}/socket.${RUBY_DLEXT} 766${RUBY_ARCHLIB}/socket.${RUBY_DLEXT}
767${RUBY_ARCHLIB}/stringio.${RUBY_DLEXT} 767${RUBY_ARCHLIB}/stringio.${RUBY_DLEXT}
768${RUBY_ARCHLIB}/strscan.${RUBY_DLEXT} 768${RUBY_ARCHLIB}/strscan.${RUBY_DLEXT}
769${RUBY_ARCHLIB}/syck.${RUBY_DLEXT} 769${RUBY_ARCHLIB}/syck.${RUBY_DLEXT}
770${RUBY_ARCHLIB}/syslog.${RUBY_DLEXT} 770${RUBY_ARCHLIB}/syslog.${RUBY_DLEXT}
771${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT} 771${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT}
772${GEM_HOME}/gems/rake-0.9.2.2/bin/rake${RUBY_VER} 772${GEM_HOME}/gems/rake-0.9.2.2/bin/rake${RUBY_VER}
773${GEM_HOME}/gems/rdoc-3.9.4/bin/rdoc${RUBY_VER} 773${GEM_HOME}/gems/rdoc-3.9.5/bin/rdoc${RUBY_VER}
774${GEM_HOME}/gems/rdoc-3.9.4/bin/ri${RUBY_VER} 774${GEM_HOME}/gems/rdoc-3.9.5/bin/ri${RUBY_VER}
775${GEM_HOME}/specifications/bigdecimal-1.1.0.gemspec 775${GEM_HOME}/specifications/bigdecimal-1.1.0.gemspec
776${GEM_HOME}/specifications/io-console-0.3.gemspec 776${GEM_HOME}/specifications/io-console-0.3.gemspec
777${GEM_HOME}/specifications/json-1.5.4.gemspec 777${GEM_HOME}/specifications/json-1.5.4.gemspec
778${GEM_HOME}/specifications/minitest-2.5.1.gemspec 778${GEM_HOME}/specifications/minitest-2.5.1.gemspec
779${GEM_HOME}/specifications/rake-0.9.2.2.gemspec 779${GEM_HOME}/specifications/rake-0.9.2.2.gemspec
780${GEM_HOME}/specifications/rdoc-3.9.4.gemspec 780${GEM_HOME}/specifications/rdoc-3.9.5.gemspec
781man/man1/erb${RUBY_VER}.1 781man/man1/erb${RUBY_VER}.1
782man/man1/irb${RUBY_VER}.1 782man/man1/irb${RUBY_VER}.1
783man/man1/rake${RUBY_VER}.1 783man/man1/rake${RUBY_VER}.1
784man/man1/ri${RUBY_VER}.1 784man/man1/ri${RUBY_VER}.1
785man/man1/${RUBY_NAME}.1 785man/man1/${RUBY_NAME}.1
786${RUBY_DOC}/COPYING 786${RUBY_DOC}/COPYING
787${RUBY_DOC}/COPYING.ja 787${RUBY_DOC}/COPYING.ja
788${RUBY_DOC}/ChangeLog 788${RUBY_DOC}/ChangeLog
789${RUBY_DOC}/ChangeLog-1.8.0 789${RUBY_DOC}/ChangeLog-1.8.0
790${RUBY_DOC}/ChangeLog-1.9.3 790${RUBY_DOC}/ChangeLog-1.9.3
791${RUBY_DOC}/ChangeLog-YARV 791${RUBY_DOC}/ChangeLog-YARV
792${RUBY_DOC}/NEWS 792${RUBY_DOC}/NEWS
793${RUBY_DOC}/NEWS-1.8.7 793${RUBY_DOC}/NEWS-1.8.7
cvs diff -r1.15 -r1.16 pkgsrc/lang/ruby193-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/Attic/distinfo 2013/02/02 08:11:53 1.15
+++ pkgsrc/lang/ruby193-base/Attic/distinfo 2013/02/06 15:48:31 1.16
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.15 2013/02/02 08:11:53 taca Exp $ 1$NetBSD: distinfo,v 1.16 2013/02/06 15:48:31 taca Exp $
2 2
3SHA1 (ruby-1.9.3-p374.tar.bz2) = fde7f6d286fcb27135d29963f04f5d0e066195f7 3SHA1 (ruby-1.9.3-p385.tar.bz2) = 54e8d08103e915e2b07dcfcea88ab7fc42d40b0a
4RMD160 (ruby-1.9.3-p374.tar.bz2) = bb3beabef451d958a27a743aa138ce6704d5cab1 4RMD160 (ruby-1.9.3-p385.tar.bz2) = b2fbe56de1295659aa54c0a2d9f77a1212f62a02
5Size (ruby-1.9.3-p374.tar.bz2) = 10017658 bytes 5Size (ruby-1.9.3-p385.tar.bz2) = 10021486 bytes
6SHA1 (patch-configure) = 01575dd71bb555cde7241a13c588a01a6bd65c3d 6SHA1 (patch-configure) = e72a5414a9e706962692e645173c5b47ddb41932
7SHA1 (patch-configure.in) = 0996411e3125a298c770f4eead0edbc530a0a584 7SHA1 (patch-configure.in) = 0996411e3125a298c770f4eead0edbc530a0a584
8SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5 8SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
9SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8 9SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
10SHA1 (patch-lib_rubygems.rb) = 2aed4990a868dc92668a78da7bcff2050ff3dd66 10SHA1 (patch-lib_rubygems.rb) = 2aed4990a868dc92668a78da7bcff2050ff3dd66
11SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3 11SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3
12SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6 12SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 85b666544fc0787e67bb54071d8660cbfe3015d6
13SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc 13SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 7d8dd07d332f0e89822d06f2d71e7552358107cc
14SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3 14SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = b8e18f1feedb7966e2a5280d6020c6134a7d83a3
15SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c 15SHA1 (patch-lib_rubygems_config__file.rb) = ed4ff25ea89a2d13ee601c7edfda0902f08fe29c
16SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26 16SHA1 (patch-lib_rubygems_defaults.rb) = 101a6e653ef3811cdda3ed333b50448c0d3f0d26
17SHA1 (patch-lib_rubygems_dependency__installer.rb) = 572775dd430619f93168732ad312d06819b6f1d7 17SHA1 (patch-lib_rubygems_dependency__installer.rb) = 572775dd430619f93168732ad312d06819b6f1d7
18SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3 18SHA1 (patch-lib_rubygems_doc__manager.rb) = 4b2d70e5dfaeff1f1b70ff27f1084065dcc742d3
19SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180 19SHA1 (patch-lib_rubygems_install__update__options.rb) = 74f81900c92bc3c7a663a112cccf6ff88b6ae180
cvs diff -r1.5 -r1.6 pkgsrc/lang/ruby193-base/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/ruby193-base/patches/Attic/patch-configure 2013/01/31 15:56:14 1.5
+++ pkgsrc/lang/ruby193-base/patches/Attic/patch-configure 2013/02/06 15:48:31 1.6
@@ -1,93 +1,94 @@ @@ -1,93 +1,94 @@
1$NetBSD: patch-configure,v 1.5 2013/01/31 15:56:14 taca Exp $ 1$NetBSD: patch-configure,v 1.6 2013/02/06 15:48:31 taca 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 2013-01-17 04:57:31.000000000 +0000 6--- configure.orig 2013-02-06 13:17:31.000000000 +0000
7+++ configure 7+++ configure
8@@ -20419,6 +20419,9 @@ _ACEOF 8@@ -10722,6 +10722,10 @@ esac
9 ;; 9 superux*) :
10 superux*) ac_cv_func_setitimer=no 10 ac_cv_func_setitimer=no
11 ;; 11 ;; #(
12+ interix*) LIBS="-lm $LIBS" 12+ interix*) :
 13+ LIBS="-lm $LIBS"
13+ ac_cv_func_getpgrp_void=yes 14+ ac_cv_func_getpgrp_void=yes
14+ ;; 15+ ;;
15 *) LIBS="-lm $LIBS" ;; 16 *) :
 17 LIBS="-lm $LIBS" ;;
16 esac 18 esac
17  19@@ -15784,7 +15788,7 @@ done
18@@ -37835,7 +37838,7 @@ done 20 MAINLIBS="-pthread $MAINLIBS" ;; #(
19 root) : ;; 21 *) :
20 c_r) MAINLIBS="-pthread $MAINLIBS" ;; 22 case "$target_os" in #(
21 *) case "$target_os" in 23- openbsd*) :
22- openbsd*) LIBS="-pthread $LIBS" ;; 24+ openbsd*|mirbsd*) :
23+ openbsd*|mirbsd*) LIBS="-pthread $LIBS" ;; 25 LIBS="-pthread $LIBS" ;; #(
24 *) LIBS="-l$pthread_lib $LIBS" ;; 26 *) :
25 esac 27 LIBS="-l$pthread_lib $LIBS" ;;
26 ;; 28@@ -16233,8 +16237,12 @@ esac ;; #(
27@@ -38856,8 +38859,12 @@ esac 29 rb_cv_dlopen=yes ;; #(
28 fi 30 interix*) :
29 rb_cv_dlopen=yes ;; 31 : ${LDSHARED='$(CC) -shared'}
30 interix*) : ${LDSHARED='$(CC) -shared'} 
31+ LDFLAGS="$LDFLAGS -Wl,-E" 32+ LDFLAGS="$LDFLAGS -Wl,-E"
32 XLDFLAGS="$XLDFLAGS -Wl,-E" 33 XLDFLAGS="$XLDFLAGS -Wl,-E"
33+ # use special random-slot linkage in 0x[56]XXXXXXX 34+ # use special random-slot linkage in 0x[56]XXXXXXX
34 LIBPATHFLAG=" -L%1\$-s" 35 LIBPATHFLAG=" -L%1\$-s"
35+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' 36+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
36+ RPATHFLAG=' -Wl,-R%1$-s' 37+ RPATHFLAG=' -Wl,-R%1$-s'
37 rb_cv_dlopen=yes ;; 38 rb_cv_dlopen=yes ;; #(
38 freebsd*|dragonfly*) 39 freebsd*|dragonfly*) :
39 : ${LDSHARED='$(CC) -shared'} 40
40@@ -38868,7 +38875,7 @@ esac 41@@ -16246,7 +16254,7 @@ esac ;; #(
41 test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" 42 test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
42 fi 43 fi
43 rb_cv_dlopen=yes ;; 44 rb_cv_dlopen=yes ;; #(
44- openbsd*) : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} 45- openbsd*) :
45+ openbsd*|mirbsd*) : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} 46+ openbsd*|mirbsd*) :
 47 : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
46 if test "$rb_cv_binary_elf" = yes; then 48 if test "$rb_cv_binary_elf" = yes; then
47 LDFLAGS="$LDFLAGS -Wl,-E" 49 LDFLAGS="$LDFLAGS -Wl,-E"
48 fi 50@@ -16775,7 +16783,7 @@ _ACEOF
49@@ -39463,7 +39470,7 @@ _ACEOF 51 freebsd*|dragonfly*) :
50 ;; 52
51 freebsd*|dragonfly*) 
52 SOLIBS='$(LIBS)' 53 SOLIBS='$(LIBS)'
53- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' 54- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
54+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' 55+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
55 if test "$rb_cv_binary_elf" != "yes" ; then 56 if test "$rb_cv_binary_elf" != "yes" ; then
56 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" 57 LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
57 LIBRUBY_ALIASES='' 58 LIBRUBY_ALIASES=''
58@@ -39479,7 +39486,7 @@ _ACEOF 59@@ -16792,7 +16800,7 @@ _ACEOF
59 LIBRUBY_ALIASES="" 60 LIBRUBY_ALIASES=""
60 fi 61 fi
61 ;; 62 ;; #(
62- openbsd*) 63- openbsd*) :
63+ openbsd*|mirbsd*) 64+ openbsd*|mirbsd*) :
 65
64 SOLIBS='$(LIBS)' 66 SOLIBS='$(LIBS)'
65 LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` 67 LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
66 ;; 68@@ -16853,7 +16861,12 @@ esac
67@@ -39531,7 +39538,12 @@ esac 69 ;; #(
68 LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib' 70 interix*) :
69 ;; 71
70 interix*) 
71- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' 72- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
72+ SOLIBS='$(LIBS)' 73+ SOLIBS='$(LIBS)'
73+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' 74+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
74+ # link explicitly to 0x48000000 75+ # link explicitly to 0x48000000
75+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' 76+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
76+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' 77+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
77+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' 78+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
78 ;; 79 ;; #(
79 esac 80 *) :
80  81 ;;
81@@ -39593,11 +39605,7 @@ if test "$install_doc" != no; then 82@@ -16916,11 +16929,7 @@ if test "$install_doc" != no; then
82 else 83 else
83 RDOCTARGET="nodoc" 84 RDOCTARGET="nodoc"
84 fi 85 fi
85- if test "$install_capi" != no -a -n "$DOXYGEN"; then 86- if test "$install_capi" != no -a -n "$DOXYGEN"; then
86- CAPITARGET="capi" 87- CAPITARGET="capi"
87- else 88- else
88- CAPITARGET="nodoc" 89- CAPITARGET="nodoc"
89- fi 90- fi
90+ CAPITARGET="nodoc" 91+ CAPITARGET="nodoc"
91 else 92 else
92 RDOCTARGET="nodoc" 93 RDOCTARGET="nodoc"
93 CAPITARGET="nodoc" 94 CAPITARGET="nodoc"