ruby 1.8.7: fix socket extension

The EXTRA_OECONF trick doesn't work for 1.8.7

Signed-off-by: Koen Kooi <k-kooi@ti.com>

diff --git a/recipes/ruby/files/disable_wide_getaddrinfo_check.patch b/recipes/ruby/files/disable_wide_getaddrinfo_check.patch
deleted file mode 100644 (file)
index 8213789..0000000
--- a/recipes/ruby/files/disable_wide_getaddrinfo_check.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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/recipes/ruby/files/extmk.patch b/recipes/ruby/ruby/extmk.patch
similarity index 100%
rename from recipes/ruby/files/extmk.patch
rename to recipes/ruby/ruby/extmk.patch

diff --git a/recipes/ruby/files/extmk_run.patch b/recipes/ruby/ruby/extmk_run.patch
similarity index 100%
rename from recipes/ruby/files/extmk_run.patch
rename to recipes/ruby/ruby/extmk_run.patch

diff --git a/recipes/ruby/files/openssl.patch b/recipes/ruby/ruby/openssl.patch
similarity index 100%
rename from recipes/ruby/files/openssl.patch
rename to recipes/ruby/ruby/openssl.patch

diff --git a/recipes/ruby/ruby_1.8.7-p302.bb b/recipes/ruby/ruby_1.8.7-p302.bb
index 13a6652..a51edd7 100644 (file)
--- a/recipes/ruby/ruby_1.8.7-p302.bb
+++ b/recipes/ruby/ruby_1.8.7-p302.bb
@@ -1,5 +1,7 @@
 require ruby.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
+
+SRC_URI += "file://0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch"
 
 SRC_URI[md5sum] = "f446550dfde0d8162a6ed8d5a38b3ac2"
 SRC_URI[sha256sum] = "5883df5204de70762602ce885b18c8bf6c856d33298c35df9151031b2ce044a1"