diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-22 10:04:30 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-22 10:04:30 +0000 |
| commit | c3be2a552db104291accd82b2e674d31d5527fcc (patch) | |
| tree | 422e82bf481b26c2a0e883d60b459cbc243d436e /packages/ruby | |
| parent | 3a508238c49e86e0476319bfe71a24fdfdd56b66 (diff) | |
| parent | 4693c8ab28f246ce11a0b80b27ab6127aea14c52 (diff) | |
merge of '77df6e755fc8272db3fd5e4c3b0620b4453ca180'
and 'f0261ce1c4acd6350d91bdaaf2939442d84a222d'
Diffstat (limited to 'packages/ruby')
| -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) |