diff options
Diffstat (limited to 'data/ruby')
| -rw-r--r-- | data/ruby/_metadata/version | 2 | ||||
| -rw-r--r-- | data/ruby/dlopen.diff | 39 | ||||
| -rw-r--r-- | data/ruby/mdns.diff | 25 | ||||
| -rw-r--r-- | data/ruby/ruby-1.8.6-p111.tar.gz | bin | 4547579 -> 0 bytes | |||
| -rw-r--r-- | data/ruby/ruby-1.9.1-p429.tar.gz | bin | 0 -> 9078126 bytes | |||
| -rw-r--r-- | data/ruby/stackend.diff | 12 | ||||
| -rw-r--r-- | data/ruby/tools.diff | 18 |
7 files changed, 11 insertions, 85 deletions
diff --git a/data/ruby/_metadata/version b/data/ruby/_metadata/version index 6aa428f33..0f72f2b3c 100644 --- a/data/ruby/_metadata/version +++ b/data/ruby/_metadata/version @@ -1 +1 @@ -1.8.6-p111 +1.9.1-p429 diff --git a/data/ruby/dlopen.diff b/data/ruby/dlopen.diff deleted file mode 100644 index 6d745a398..000000000 --- a/data/ruby/dlopen.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru ruby-1.8.6-p111/dln.c ruby-1.8.6-p111+iPhone/dln.c ---- ruby-1.8.6-p111/dln.c 2007-08-22 02:46:14.000000000 +0000 -+++ ruby-1.8.6-p111+iPhone/dln.c 2008-07-22 09:22:48.000000000 +0000 -@@ -87,13 +87,13 @@ - - #ifndef NO_DLN_LOAD - --#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(__APPLE__) && !defined(_UNICOSMP) -+#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(_UNICOSMP) - /* dynamic load with dlopen() */ - # define USE_DLN_DLOPEN - #endif - - #ifndef FUNCNAME_PATTERN --# if defined(__hp9000s300) || (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) || (defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__) -+# if defined(__hp9000s300) || (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) || (defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__WATCOMC__) - # define FUNCNAME_PATTERN "_Init_%s" - # else - # define FUNCNAME_PATTERN "Init_%s" -@@ -1140,10 +1140,6 @@ - #define NSLINKMODULE_OPTION_BINDNOW 1 - #endif - #endif --#else --#ifdef __APPLE__ --#include <mach-o/dyld.h> --#endif - #endif - - #if defined _WIN32 && !defined __CYGWIN__ -@@ -1403,7 +1399,7 @@ - } - #endif /* _AIX */ - --#if defined(NeXT) || defined(__APPLE__) -+#if defined(NeXT) - #define DLN_DEFINED - /*---------------------------------------------------- - By SHIROYAMA Takayuki Psi@fortune.nest.or.jp diff --git a/data/ruby/mdns.diff b/data/ruby/mdns.diff deleted file mode 100644 index 678511f41..000000000 --- a/data/ruby/mdns.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff -ru ruby-1.8.6-p111/main.c ruby-1.8.6-p111+iPhone/main.c ---- ruby-1.8.6-p111/main.c 2007-02-12 23:01:19.000000000 +0000 -+++ ruby-1.8.6-p111+iPhone/main.c 2008-01-31 08:08:03.000000000 +0000 -@@ -1,3 +1,5 @@ -+#include <mach-o/nlist.h> -+ - /********************************************************************** - - main.c - -@@ -34,6 +36,15 @@ - int argc; - char **argv, **envp; - { -+#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200 -+ struct nlist nl[2]; -+ memset(nl, 0, sizeof(nl)); -+ nl[0].n_un.n_name = (char *) "_useMDNSResponder"; -+ nlist("/usr/lib/libc.dylib", nl); -+ if (nl[0].n_type != N_UNDF) -+ *(int *) nl[0].n_value = 0; -+#endif -+ - #ifdef _WIN32 - NtInitialize(&argc, &argv); - #endif diff --git a/data/ruby/ruby-1.8.6-p111.tar.gz b/data/ruby/ruby-1.8.6-p111.tar.gz Binary files differdeleted file mode 100644 index a5e774698..000000000 --- a/data/ruby/ruby-1.8.6-p111.tar.gz +++ /dev/null diff --git a/data/ruby/ruby-1.9.1-p429.tar.gz b/data/ruby/ruby-1.9.1-p429.tar.gz Binary files differnew file mode 100644 index 000000000..b1446045b --- /dev/null +++ b/data/ruby/ruby-1.9.1-p429.tar.gz diff --git a/data/ruby/stackend.diff b/data/ruby/stackend.diff deleted file mode 100644 index 2bbb5fe40..000000000 --- a/data/ruby/stackend.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru ruby-1.8.6-p111/gc.c ruby-1.8.6-p111+iPhone/gc.c ---- ruby-1.8.6-p111/gc.c 2007-03-03 07:30:46.000000000 +0000 -+++ ruby-1.8.6-p111+iPhone/gc.c 2008-01-14 10:08:59.000000000 +0000 -@@ -1365,7 +1367,7 @@ - setjmp(save_regs_gc_mark); - mark_locations_array((VALUE*)save_regs_gc_mark, sizeof(save_regs_gc_mark) / sizeof(VALUE *)); - #if STACK_GROW_DIRECTION < 0 -- rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start); -+ rb_gc_mark_locations((VALUE*)((uintptr_t)STACK_END & ~0xf), rb_gc_stack_start); - #elif STACK_GROW_DIRECTION > 0 - rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1); - #else diff --git a/data/ruby/tools.diff b/data/ruby/tools.diff index e2e6723bf..4f67dd0fa 100644 --- a/data/ruby/tools.diff +++ b/data/ruby/tools.diff @@ -1,7 +1,7 @@ -diff -ru ruby-1.8.6-p111/configure.in ruby-1.8.6-p111+iPhone/configure.in ---- ruby-1.8.6-p111/configure.in 2007-09-07 07:38:51.000000000 +0000 -+++ ruby-1.8.6-p111+iPhone/configure.in 2008-01-14 07:16:01.000000000 +0000 -@@ -1052,7 +1052,7 @@ +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 ;; @@ -9,8 +9,8 @@ diff -ru ruby-1.8.6-p111/configure.in ruby-1.8.6-p111+iPhone/configure.in + darwin*) : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress -flat_namespace'} : ${LDFLAGS=""} : ${LIBPATHENV=DYLD_LIBRARY_PATH} - rb_cv_dlopen=yes ;; -@@ -1172,15 +1172,15 @@ + # /usr/local/include is always searched for +@@ -1578,15 +1578,15 @@ case "$target_os" in linux* | gnu* | k*bsd*-gnu) @@ -31,12 +31,14 @@ diff -ru ruby-1.8.6-p111/configure.in ruby-1.8.6-p111+iPhone/configure.in esac EXTSTATIC= -@@ -1372,7 +1372,7 @@ +@@ -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 $(MAJOR).$(MINOR)' + 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 |