From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 1 May 2014 15:28:46 +0000 (+0000)
Subject: ruby: fix unresolved getaddrinfo #9873 and update to 1.9.3p545
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b706874f63f33626a28350fcfcc5d87a6904559c;p=openwrt%2Fsvn-archive%2Farchive.git

ruby: fix unresolved getaddrinfo #9873 and update to 1.9.3p545

ruby fails to check wide_getaddrinfo, which is important only for
non-linux env.

Luiz Angelo Daros de Luca <luizluca@gmail.com>


SVN-Revision: 40630
---

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 7f5acf3746..9952504c14 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -15,14 +15,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruby
-PKG_VERSION:=1.9.3-p484
+PKG_VERSION:=1.9.3-p545
 PKG_RELEASE:=1
 
 PKG_LIBVER:=1.9
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.ruby-lang.org/pub/ruby/$(PKG_LIBVER)/
-PKG_MD5SUM:=03f5b08804927ceabe5122cb90f5d0a9
+PKG_MD5SUM:=4743c1dc48491070bae8fc8b423bc1a7
 
 PKG_BUILD_DEPENDS:=ruby/host
 PKG_INSTALL:=1
@@ -212,7 +212,6 @@ CONFIGURE_ARGS += \
 	--enable-static \
 	--disable-rpath \
 	--enable-ipv6 \
-	--enable-wide-getaddrinfo \
 	--with-ruby-version=minor \
 	--with-iconv-dir=$(ICONV_PREFIX) \
 
diff --git a/lang/ruby/patches/001-ignore_wide_getaddrinfo_while_crosscompiling.patch b/lang/ruby/patches/001-ignore_wide_getaddrinfo_while_crosscompiling.patch
new file mode 100644
index 0000000000..426272633e
--- /dev/null
+++ b/lang/ruby/patches/001-ignore_wide_getaddrinfo_while_crosscompiling.patch
@@ -0,0 +1,10 @@
+--- a/ext/socket/extconf.rb    2013-02-14 23:20:13.581918676 -0200
++++ b/ext/socket/extconf.rb    2013-02-14 23:21:25.761918667 -0200
+@@ -254,6 +254,7 @@
+ end
+ 
+ getaddr_info_ok = (enable_config("wide-getaddrinfo") && :wide) ||
++  (CROSS_COMPILING && :cross) ||
+   (checking_for("wide getaddrinfo") {try_run(<<EOF)} && :os)
+ #{cpp_include(headers)}
+ #include <stdlib.h>