diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-12 20:04:58 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-12 20:04:58 +0000 |
| commit | dc2e799a19a5d57c1ae2bcf8844601245c06b6d0 (patch) | |
| tree | 04c3e5f4efaea707aa40d0c00f4780187d71c6d0 /packages/ruby/ruby-1.8.5 | |
| parent | d136678e618e308ee7a47a1650102a9886fafcb2 (diff) | |
| parent | 9b6534ba102d9b548d31665f1afa9149128a55b7 (diff) | |
merge of '8e8bab6fb50f5098375feebdb8f5e06408bc3e2e'
and 'fa0c91a57dfd0c1ecb6d5eeb7b1f12db5973ca2a'
Diffstat (limited to 'packages/ruby/ruby-1.8.5')
| -rw-r--r-- | packages/ruby/ruby-1.8.5/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch | 16 | ||||
| -rw-r--r-- | packages/ruby/ruby-1.8.5/extmk_run.patch | 15 |
3 files changed, 31 insertions, 0 deletions
diff --git a/packages/ruby/ruby-1.8.5/.mtn2git_empty b/packages/ruby/ruby-1.8.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ruby/ruby-1.8.5/.mtn2git_empty diff --git a/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch b/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch new file mode 100644 index 0000000000..82137896b9 --- /dev/null +++ b/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch @@ -0,0 +1,16 @@ +--- packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch f667776fd8760b7048cc9617930112347b0ef2c0 ++++ packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch f667776fd8760b7048cc9617930112347b0ef2c0 +@@ -0,0 +1,13 @@ ++--- ruby-1.8.5/ext/socket/extconf.rb.orig 2006-12-30 15:12:31.000000000 +1100 +++++ ruby-1.8.5/ext/socket/extconf.rb 2006-12-30 15:16:24.000000000 +1100 ++@@ -216,6 +216,10 @@ ++ } ++ EOF ++ end +++# Ignore the actual result of the above test and assume that +++# everything is OK. +++getaddr_info_ok = true +++ ++ if ipv6 and not getaddr_info_ok ++ abort <<EOS ++ diff --git a/packages/ruby/ruby-1.8.5/extmk_run.patch b/packages/ruby/ruby-1.8.5/extmk_run.patch new file mode 100644 index 0000000000..57926f51b0 --- /dev/null +++ b/packages/ruby/ruby-1.8.5/extmk_run.patch @@ -0,0 +1,15 @@ +============================================================ +--- packages/ruby/ruby-1.8.5/extmk_run.patch d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48 ++++ packages/ruby/ruby-1.8.5/extmk_run.patch d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48 +@@ -0,0 +1,11 @@ ++--- ruby-1.8.5/common.mk.orig 2006-12-30 13:07:32.000000000 +1100 +++++ ruby-1.8.5/common.mk 2006-12-30 13:08:32.000000000 +1100 ++@@ -56,7 +56,7 @@ ++ --make="$(MAKE)" \ ++ --mflags="$(MFLAGS)" \ ++ --make-flags="$(MAKEFLAGS)" ++-EXTMK_ARGS = $(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) -- +++EXTMK_ARGS = $(SCRIPT_ARGS) --with-ldflags="%%TARGET_LDFLAGS%%" --with-cflags="%%TARGET_CFLAGS%%" --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) -- ++ ++ all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY) ++ @$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) |