From 6d0edd6de767800b01ab1be97617ffeacd558d2b Mon Sep 17 00:00:00 2001
From: Jay Freeman <saurik@saurik.com>
Date: Sun, 8 Aug 2010 05:27:22 +0000
Subject: Upgraded to ruby 1.9.2 (wycats).

git-svn-id: http://svn.telesphoreo.org/trunk@725 514c082c-b64e-11dc-b46d-3d985efe055d
---
 data/ruby/_metadata/version      |   2 +-
 data/ruby/arm.diff               |  13 ++++++++++++
 data/ruby/rdoc.diff              |  21 +++++++++++++++++++
 data/ruby/ruby-1.9.1-p429.tar.gz | Bin 9078126 -> 0 bytes
 data/ruby/ruby-1.9.2-rc2.tar.bz2 | Bin 0 -> 8480974 bytes
 data/ruby/strip.diff             |  15 +++++++++++++
 data/ruby/tools.diff             |  44 ---------------------------------------
 7 files changed, 50 insertions(+), 45 deletions(-)
 create mode 100644 data/ruby/arm.diff
 create mode 100644 data/ruby/rdoc.diff
 delete mode 100644 data/ruby/ruby-1.9.1-p429.tar.gz
 create mode 100644 data/ruby/ruby-1.9.2-rc2.tar.bz2
 create mode 100644 data/ruby/strip.diff
 delete mode 100644 data/ruby/tools.diff

(limited to 'data')

diff --git a/data/ruby/_metadata/version b/data/ruby/_metadata/version
index 0f72f2b3c..7c61d96df 100644
--- a/data/ruby/_metadata/version
+++ b/data/ruby/_metadata/version
@@ -1 +1 @@
-1.9.1-p429
+1.9.2~rc2
diff --git a/data/ruby/arm.diff b/data/ruby/arm.diff
new file mode 100644
index 000000000..3519cad58
--- /dev/null
+++ b/data/ruby/arm.diff
@@ -0,0 +1,13 @@
+diff -ru ruby-1.9.2-rc2/configure.in ruby-1.9.2-rc2+iPhone/configure.in
+--- ruby-1.9.2-rc2/configure.in	2010-07-10 04:06:05.000000000 +0000
++++ ruby-1.9.2-rc2+iPhone/configure.in	2010-08-08 00:05:23.000000000 +0000
+@@ -185,6 +185,9 @@
+ 	    AC_MSG_CHECKING([for real target cpu])
+ 	    target=`echo $target | sed "s/^$target_cpu-/-/"`
+ 	    target_cpu=`$CC -E - 2>/dev/null <<EOF |
++#ifdef __arm__
++"processor-name=arm"
++#endif
+ #ifdef __x86_64__
+ "processor-name=x86_64"
+ #endif
diff --git a/data/ruby/rdoc.diff b/data/ruby/rdoc.diff
new file mode 100644
index 000000000..7bda89a18
--- /dev/null
+++ b/data/ruby/rdoc.diff
@@ -0,0 +1,21 @@
+diff -ru ruby-1.9.2-rc2/common.mk ruby-1.9.2-rc2+iPhone/common.mk
+--- ruby-1.9.2-rc2/common.mk	2010-07-01 04:00:56.000000000 +0000
++++ ruby-1.9.2-rc2+iPhone/common.mk	2010-08-08 00:16:06.000000000 +0000
+@@ -354,7 +354,7 @@
+ 
+ rdoc: PHONY main
+ 	@echo Generating RDoc documentation
+-	$(XRUBY) "$(srcdir)/bin/rdoc" --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)"
++	$(XRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)"
+ nodoc: PHONY
+ 
+ what-where-doc: no-install-doc
+diff -ru ruby-1.9.2-rc2/doc/re.rdoc ruby-1.9.2-rc2+iPhone/doc/re.rdoc
+--- ruby-1.9.2-rc2/doc/re.rdoc	2010-04-10 06:36:13.000000000 +0000
++++ ruby-1.9.2-rc2+iPhone/doc/re.rdoc	2010-08-08 00:32:03.000000000 +0000
+@@ -1,5 +1,3 @@
+-# -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
+-
+ Regular expressions (<i>regexp</i>s) are patterns which describe the
+ contents of a string. They're used for testing whether a string contains a
+ given pattern, or extracting the portions that match. They are created
diff --git a/data/ruby/ruby-1.9.1-p429.tar.gz b/data/ruby/ruby-1.9.1-p429.tar.gz
deleted file mode 100644
index b1446045b..000000000
Binary files a/data/ruby/ruby-1.9.1-p429.tar.gz and /dev/null differ
diff --git a/data/ruby/ruby-1.9.2-rc2.tar.bz2 b/data/ruby/ruby-1.9.2-rc2.tar.bz2
new file mode 100644
index 000000000..16e898420
Binary files /dev/null and b/data/ruby/ruby-1.9.2-rc2.tar.bz2 differ
diff --git a/data/ruby/strip.diff b/data/ruby/strip.diff
new file mode 100644
index 000000000..6ba8d49d8
--- /dev/null
+++ b/data/ruby/strip.diff
@@ -0,0 +1,15 @@
+diff -ru ruby-1.9.2-rc2/configure.in ruby-1.9.2-rc2+iPhone/configure.in
+--- ruby-1.9.2-rc2/configure.in	2010-07-10 04:06:05.000000000 +0000
++++ ruby-1.9.2-rc2+iPhone/configure.in	2010-08-07 23:48:29.000000000 +0000
+@@ -1967,9 +1967,9 @@
+ 
+ AS_CASE(["$target_os"],
+   [linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu], [
+-	STRIP='strip -S -x'],
++	STRIP=${STRIP}' -S -x'],
+   [nextstep* | openstep* | rhapsody* | darwin*], [
+-	STRIP='strip -A -n'])
++	STRIP=${STRIP}' -A -n'])
+ 
+ AC_ARG_WITH(ext,
+             AC_HELP_STRING([--with-ext=EXTS],
diff --git a/data/ruby/tools.diff b/data/ruby/tools.diff
deleted file mode 100644
index 4f67dd0fa..000000000
--- a/data/ruby/tools.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ru ruby-1.9.1-p429/configure.in ruby-1.9.1-p429+iPhone/configure.in
---- ruby-1.9.1-p429/configure.in	2010-05-03 03:06:07.000000000 +0000
-+++ ruby-1.9.1-p429+iPhone/configure.in	2010-08-07 23:16:58.000000000 +0000
-@@ -1418,7 +1418,7 @@
- 	rhapsody*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
- 			: ${LDFLAGS=""}
- 			rb_cv_dlopen=yes ;;
--	darwin*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'}
-+	darwin*)	: ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress -flat_namespace'}
- 			: ${LDFLAGS=""}
- 			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
- 			# /usr/local/include is always searched for
-@@ -1578,15 +1578,15 @@
- 
- case "$target_os" in
-   linux* | gnu* | k*bsd*-gnu)
--	STRIP='strip -S -x';;
-+	STRIP=${STRIP}' -S -x';;
-   nextstep*)
--	STRIP='strip -A -n';;
-+	STRIP=${STRIP}' -A -n';;
-   openstep*)
--	STRIP='strip -A -n';;
-+	STRIP=${STRIP}' -A -n';;
-   rhapsody*)
--	STRIP='strip -A -n';;
-+	STRIP=${STRIP}' -A -n';;
-   darwin*)
--	STRIP='strip -A -n';;
-+	STRIP=${STRIP}' -A -n';;
- esac
- 
- EXTSTATIC=
-@@ -1781,7 +1781,7 @@
- 	;;
-     darwin*)
- 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
--	LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
-+	LIBRUBY_LDSHARED='$(CC) -dynamiclib -undefined suppress -flat_namespace'
- 	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(ruby_version)'
- 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
- 	;;
-Only in ruby-1.9.1-p429+iPhone: configure.in.orig
-Only in ruby-1.9.1-p429+iPhone: configure.in.rej
-- 
cgit v1.2.3