Browse files

* configure.in: revert revision r29854. This revision introduced

  binary incompatibilities on some circumstances.  The bug that
  revision was fixing gets reopened by this reversion.
  [ruby-dev:43152] cf. [Bug #2553]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@30895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 45ae87b commit c13ff8bbfd3350423f7fd635d3b46904c614c350 @shyouhei shyouhei committed Feb 18, 2011
Showing with 16 additions and 23 deletions.
  1. +7 −0 ChangeLog
  2. +3 −17 configure.in
  3. +6 −6 version.h
View
7 ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb 18 19:22:17 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * configure.in: revert revision r29854. This revision introduced
+ binary incompatibilities on some circumstances. The bug that
+ revision was fixing gets reopened by this reversion.
+ [ruby-dev:43152] cf. [Bug #2553]
+
Thu Dec 23 12:22:35 2010 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::IPv4::Regex): make it only accept 0 to 255.
View
20 configure.in
@@ -522,7 +522,7 @@ AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/
fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \
sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \
- intrinsics.h time.h)
+ ucontext.h intrinsics.h time.h)
dnl Check additional types.
AC_CHECK_SIZEOF(rlim_t, 0, [
@@ -1085,22 +1085,8 @@ if test x"$enable_pthread" = xyes; then
fi
fi
fi
-
-use_context=no
-if test x"$rb_with_pthread" = xyes; then
- AS_CASE("$target_cpu:$target_os:$cross_compiling",
- [*:linux*:no], [
- if test -n "`(/lib/libc.so.6 2>/dev/null | fgrep 'linuxthreads') 2> /dev/null`"; then
- use_context=yes
- fi
- ],
- [sparc*], [
- use_context=yes
- ])
-fi
-if test x"$use_context" = xyes; then
- AC_CHECK_HEADERS(ucontext.h)
- if test x"$ac_cv_header_ucontext_h" = xyes; then
+if test x"$ac_cv_header_ucontext_h" = xyes; then
+ if test x"$rb_with_pthread" = xyes; then
AC_CHECK_FUNCS(getcontext setcontext)
fi
fi
View
12 version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-12-23"
+#define RUBY_RELEASE_DATE "2011-02-18"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20101223
-#define RUBY_PATCHLEVEL 330
+#define RUBY_RELEASE_CODE 20110218
+#define RUBY_PATCHLEVEL 331
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
-#define RUBY_RELEASE_YEAR 2010
-#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_YEAR 2011
+#define RUBY_RELEASE_MONTH 2
+#define RUBY_RELEASE_DAY 18
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];

0 comments on commit c13ff8b

Please sign in to comment.