Update ruby18-base to 1.8.6.36 (Ruby 1.8.6 patchlevel 36).

Ruby 1.8.6 patchlevel 36 is maintainous release of Ruby.

Changes are too many, please see ChangeLog:

    http://svn.ruby-lang.org/repos/ruby/tags/v1_8_6_36/ChangeLog
This commit is contained in:
taca 2007-09-09 14:17:13 +00:00
parent 14bb35ca2f
commit 9440031161
7 changed files with 64 additions and 39 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.35 2007/06/28 01:31:52 dmcmahill Exp $
# $NetBSD: Makefile,v 1.36 2007/09/09 14:17:13 taca Exp $
#
DISTNAME= ${RUBY_DISTNAME}
PKGREVISION= 1
PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
CATEGORIES= lang ruby
MASTER_SITES= ${MASTER_SITE_RUBY}

View file

@ -1,9 +1,11 @@
$NetBSD: distinfo,v 1.19 2007/03/15 16:41:30 taca Exp $
$NetBSD: distinfo,v 1.20 2007/09/09 14:17:13 taca Exp $
SHA1 (ruby-1.8.6.tar.bz2) = 5c2e10c3f5f0cbbd72c9b8df8f402e7613de641b
RMD160 (ruby-1.8.6.tar.bz2) = b5be823179def82eff8436ce2bffef2e453cc8d2
Size (ruby-1.8.6.tar.bz2) = 3946186 bytes
SHA1 (patch-aa) = c8c7539433a61a772b6e9a03fb237335816c1cea
SHA1 (patch-ab) = c2be88bed22ea671ef0fa4c47b081fee067a1dd1
SHA1 (ruby-1.8.6-p36.tar.bz2) = 680375cfbe817b656e2e97c34a5a937733d66012
RMD160 (ruby-1.8.6-p36.tar.bz2) = 44f5cb95422d3f97628101aa4e425ab9f372a282
Size (ruby-1.8.6-p36.tar.bz2) = 3905975 bytes
SHA1 (patch-aa) = 931e50a45198bb38e3cf2e37eca47899e85f5b9a
SHA1 (patch-ab) = 2bf3a1f828eba04eeb65f0dd36060b4a736906ad
SHA1 (patch-ac) = b84bc931ab3dd7fe619cca846a300673fa71f48e
SHA1 (patch-ae) = dfa9c5296c75f6193c790fca8d3eb15ad4a9f228
SHA1 (patch-bk) = dad868e5b79fee3171a55c9887debd2ad0592bcc
SHA1 (patch-dg) = 5bd5e051f70abd6c95128f20867bff24c4483727

View file

@ -1,7 +1,8 @@
# $NetBSD: options.mk,v 1.2 2007/01/28 15:15:58 taca Exp $
# $NetBSD: options.mk,v 1.3 2007/09/09 14:17:13 taca Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ruby
PKG_SUPPORTED_OPTIONS= ruby-build-ri-db
PKG_OPTIONS_VAR= PKG_OPTIONS.ruby
PKG_SUPPORTED_OPTIONS= ruby-build-ri-db
PKG_SUGGESTED_OPTIONS= ruby-build-ri-db
.include "../../mk/bsd.options.mk"

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.8 2007/03/15 16:41:30 taca Exp $
$NetBSD: patch-aa,v 1.9 2007/09/09 14:17:13 taca Exp $
--- configure.in.orig 2007-02-28 22:23:42.000000000 +0900
--- configure.in.orig 2007-05-23 03:19:07.000000000 +0900
+++ configure.in
@@ -416,6 +416,9 @@ msdosdjgpp*) LIBS="-lm $LIBS"
@@ -421,6 +421,9 @@ msdosdjgpp*) LIBS="-lm $LIBS"
;;
bsdi*) LIBS="-lm $LIBS"
ac_cv_sizeof_rlim_t=8;;
@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.8 2007/03/15 16:41:30 taca Exp $
freebsd*) LIBS="-lm $LIBS"
AC_CACHE_CHECK([whether -lxpg4 has to be linked],
rb_cv_lib_xpg4_needed,
@@ -1021,6 +1024,13 @@ if test "$with_dln_a_out" != yes; then
@@ -1026,6 +1029,13 @@ if test "$with_dln_a_out" != yes; then
LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
fi
rb_cv_dlopen=yes ;;
@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.8 2007/03/15 16:41:30 taca Exp $
interix*) : ${LDSHARED="$CC -shared"}
XLDFLAGS="$XLDFLAGS -Wl,-E"
LIBPATHFLAG=" -L'%1\$-s'"
@@ -1383,6 +1393,14 @@ if test "$enable_shared" = 'yes'; then
@@ -1376,6 +1386,14 @@ if test "$enable_shared" = 'yes'; then
LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
;;
@ -39,16 +39,13 @@ $NetBSD: patch-aa,v 1.8 2007/03/15 16:41:30 taca Exp $
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
+ ;;
interix*)
LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
;;
@@ -1393,8 +1411,10 @@ fi
@@ -1385,6 +1403,7 @@ if test "$enable_shared" = 'yes'; then
fi
if test "$enable_rpath" = yes; then
if test "$GCC" = yes; then
LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
+ LIBRUBY_DLDFLAGS='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBY_DLDFLAGS"
else
LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
+ LIBRUBY_DLDFLAGS='-R $(libdir) -L$(libdir) -L. '"$LIBRUBY_DLDFLAGS"
fi
LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBYARG_SHARED"
+ LIBRUBY_DLDFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBY_DLDFLAGS"
fi
LDFLAGS="-L. $LDFLAGS"

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ab,v 1.8 2007/03/15 16:41:30 taca Exp $
$NetBSD: patch-ab,v 1.9 2007/09/09 14:17:13 taca Exp $
--- configure.orig 2007-03-05 00:11:03.000000000 +0900
--- configure.orig 2007-06-08 17:51:42.000000000 +0900
+++ configure
@@ -10346,6 +10346,9 @@ msdosdjgpp*) LIBS="-lm $LIBS"
@@ -10351,6 +10351,9 @@ msdosdjgpp*) LIBS="-lm $LIBS"
;;
bsdi*) LIBS="-lm $LIBS"
ac_cv_sizeof_rlim_t=8;;
@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.8 2007/03/15 16:41:30 taca Exp $
freebsd*) LIBS="-lm $LIBS"
{ echo "$as_me:$LINENO: checking whether -lxpg4 has to be linked" >&5
echo $ECHO_N "checking whether -lxpg4 has to be linked... $ECHO_C" >&6; }
@@ -15947,6 +15950,13 @@ echo $ECHO_N "checking whether OS depend
@@ -15952,6 +15955,13 @@ echo $ECHO_N "checking whether OS depend
LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
fi
rb_cv_dlopen=yes ;;
@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.8 2007/03/15 16:41:30 taca Exp $
interix*) : ${LDSHARED="$CC -shared"}
XLDFLAGS="$XLDFLAGS -Wl,-E"
LIBPATHFLAG=" -L'%1\$-s'"
@@ -16714,6 +16724,14 @@ if test "$enable_shared" = 'yes'; then
@@ -16707,6 +16717,14 @@ if test "$enable_shared" = 'yes'; then
LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
;;
@ -39,16 +39,13 @@ $NetBSD: patch-ab,v 1.8 2007/03/15 16:41:30 taca Exp $
+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
+ ;;
interix*)
LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
;;
@@ -16724,8 +16742,10 @@ fi
@@ -16716,6 +16734,7 @@ if test "$enable_shared" = 'yes'; then
fi
if test "$enable_rpath" = yes; then
if test "$GCC" = yes; then
LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
+ LIBRUBY_DLDFLAGS='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBY_DLDFLAGS"
else
LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
+ LIBRUBY_DLDFLAGS='-R $(libdir) -L$(libdir) -L. '"$LIBRUBY_DLDFLAGS"
fi
LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBYARG_SHARED"
+ LIBRUBY_DLDFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBY_DLDFLAGS"
fi
LDFLAGS="-L. $LDFLAGS"

View file

@ -0,0 +1,14 @@
$NetBSD: patch-bk,v 1.3 2007/09/09 14:17:13 taca Exp $
This is a fix for ruby-1.8.6 patchlevel 36.
--- intern.h.orig 2007-06-07 21:40:01.000000000 +0900
+++ intern.h
@@ -204,7 +204,6 @@ int rb_thread_alone _((void));
void rb_thread_polling _((void));
void rb_thread_sleep _((int));
void rb_thread_sleep_forever _((void));
-enum rb_thread_status rb_thread_status _((VALUE));
VALUE rb_thread_stop _((void));
VALUE rb_thread_wakeup _((VALUE));
VALUE rb_thread_wakeup_alive _((VALUE));

View file

@ -0,0 +1,15 @@
$NetBSD: patch-dg,v 1.1 2007/09/09 14:17:13 taca Exp $
This is a fix for ruby-1.8.6 patchlevel 36.
--- lib/base64.rb.orig 2007-02-27 20:51:55.000000000 +0900
+++ lib/base64.rb
@@ -110,7 +110,7 @@ module Base64
# UnVieQ==
def b64encode(bin, len = 60)
- encode64(bin).scan(/.{1,#{len}}/o) do
+ encode64(bin).scan(/.{1,#{len}}/) do
print $&, "\n"
end
end