Skip to contentSkip to conversation

ruby: fix socket extension compile

PATCH New Jesse Gilles 1 participant 3 messages Sep 29, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ruby: fix socket extension compile

* fixes building socket extension with ipv6 enabled

---
 recipes/ruby/ruby.inc |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
recipes/ruby/ruby.inc +4 -1
index 6ef6535..cd8d2df 100644
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "ruby-native zlib openssl"
 DEPENDS_virtclass-native = ""
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
@@ -18,6 +18,9 @@ S = "${WORKDIR}/ruby-${PV}"
 
 inherit autotools
 
+# fix building of socket extension
+EXTRA_OECONF = "--enable-wide-getaddrinfo"
+
 # This snippet lets compiled extensions which rely on external libraries,
 # such as zlib, compile properly.  If we don't do this, then when extmk.rb
 # runs, it uses the native libraries instead of the target libraries, and so
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/3 ruby: remove 1.8.5

* old version that doesn't build

---
 recipes/ruby/ruby_1.8.5.bb |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
 delete mode 100644 recipes/ruby/ruby_1.8.5.bb
recipes/ruby/ruby_1.8.5.bb deleted +0 -10
deleted file mode 100644
index 1561fdd..0000000
@@ -1,10 +0,0 @@
-require ruby.inc
-
-PR = "${INC_PR}.0"
-
-FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
-                    ${libdir}/ruby/1.8/*/*/.debug"
-
-
-SRC_URI[md5sum] = "3fbb02294a8ca33d4684055adba5ed6f"
-SRC_URI[sha256sum] = "19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58"
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 3/3 ruby: update SRC_URI in ruby.inc

In reply to Jesse Gilles
---
 recipes/ruby/ruby.inc           |    4 ++--
 recipes/ruby/ruby_1.8.7-p302.bb |    4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
recipes/ruby/ruby.inc +2 -2
index cd8d2df..cbae809 100644
@@ -11,8 +11,8 @@ INC_PR = "r2"
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
            file://extmk_run.patch \
-           file://openssl.patch \
-           file://disable_wide_getaddrinfo_check.patch"
+           file://extmk.patch \
+"
 
 S = "${WORKDIR}/ruby-${PV}"
 
recipes/ruby/ruby_1.8.7-p302.bb +0 -4
index 8c9da40..13a6652 100644
@@ -1,10 +1,6 @@
 require ruby.inc
 PR = "${INC_PR}.0"
 
-SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
-           file://extmk_run.patch \
-           file://extmk.patch \
-"
 SRC_URI[md5sum] = "f446550dfde0d8162a6ed8d5a38b3ac2"
 SRC_URI[sha256sum] = "5883df5204de70762602ce885b18c8bf6c856d33298c35df9151031b2ce044a1"
 
Signature · 1 line
1.7.0.4