summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-02 00:53:41 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-02 00:53:41 +0000
commitdc08155a0f2094f94bd028ba2956c16900e7fafb (patch)
tree678679352acc985408cfbc544f2269408debccc2
parent309308e0243678cdbb15997904f99ada070b2158 (diff)
* configure.in (darwin): disabled fat-binary support which confuses
configure much, since ``universal'' implies hidden cross-compiling. TODO: ruby and libruby.bundle might be possible to bound with `lipo' after builds for each archs. Anyway, config.h and rbconfig.rb must be separated definitely at least. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15366 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--configure.in2
-rw-r--r--version.h6
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b9121d4dba..8a8bcbe40f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Feb 2 09:53:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (darwin): disabled fat-binary support which confuses
+ configure much, since ``universal'' implies hidden cross-compiling.
+ TODO: ruby and libruby.bundle might be possible to bound with `lipo'
+ after builds for each archs. Anyway, config.h and rbconfig.rb must
+ be separated definitely at least.
+
Fri Feb 1 21:42:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (darwin): _XOPEN_SOURCE is necessary to make ucontext_t
diff --git a/configure.in b/configure.in
index 6744b0ace2..eb0f0ccda6 100644
--- a/configure.in
+++ b/configure.in
@@ -75,6 +75,7 @@ AC_CANONICAL_TARGET
target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
ac_install_sh='' # unusable for extension libraries.
+ifelse(currently,disabled, [
dnl checks for fat-binary
AC_ARG_ENABLE(fat-binary,
[ --enable-fat-binary=ARCHS
@@ -128,6 +129,7 @@ if test "$fat_binary" != no; then
done
AC_DEFINE(NEXT_FAT_BINARY)
fi
+], [fat_binary=no])
case $target_cpu in
i?86) frame_address=yes;;
diff --git a/version.h b/version.h
index 639d6c6388..737febad8a 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-02-01"
+#define RUBY_RELEASE_DATE "2008-02-02"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080201
+#define RUBY_RELEASE_CODE 20080202
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 2
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];