[patch-team] - Upgrade ruby to 1.9.2-p0 - corrects file clashes between ruby-readline...

[packages.git] / lang / ruby / Makefile

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 6829fe8..c631e2b 100644 (file)
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -15,15 +15,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruby
-PKG_LIBVER:=1.9.1
-PKG_VERSION:=$(PKG_LIBVER)-p376
-PKG_RELEASE:=2
+PKG_VERSION:=1.9.2-p0
+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/1.9/
-PKG_MD5SUM:=ebb20550a11e7f1a2fbd6fdec2a3e0a3
+PKG_SOURCE_URL:=ftp://ftp.ruby-lang.org/pub/ruby/$(PKG_LIBVER)/
+PKG_MD5SUM:=d8a02cadf57d2571cd4250e248ea7e4b
 
 PKG_BUILD_DEPENDS:=ruby/host
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
@@ -59,6 +62,7 @@ $(call Package/ruby/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE+= (shared library)
+  DEPENDS+= +libpthread
 endef
 
 # Ongoing work to break up ruby's standard library into coherent pieces
@@ -203,16 +207,14 @@ CONFIGURE_ARGS += \
        --disable-rpath \
        --enable-ipv6 \
        --enable-wide-getaddrinfo \
-
-CONFIGURE_VARS += \
-       ac_cv_func_setpgrp_void=yes
+       --with-ruby-version=minor \
+       --with-iconv-dir=$(STAGING_DIR_ROOT)/../usr/lib/libiconv \
 
 TARGET_LDFLAGS += -L$(PKG_BUILD_DIR)
 
 MAKE_FLAGS += \
        DESTDIR="$(PKG_INSTALL_DIR)" \
-       SHELL="/bin/bash" \
-       all install
+       SHELL="/bin/bash"
 
 define Build/Prepare
 $(call Build/Prepare/Default)
@@ -381,7 +383,6 @@ define Package/ruby-openssl/install
                usr/lib/ruby/$(PKG_LIBVER)/*/openssl.so \
                usr/lib/ruby/$(PKG_LIBVER)/drb/ssl.rb \
                usr/lib/ruby/$(PKG_LIBVER)/net/https.rb \
-               usr/lib/ruby/$(PKG_LIBVER)/webrick/ssl.rb \
        ) | ( cd $(1); $(TAR) -xf - )
 endef
 
@@ -404,8 +405,6 @@ endef
 define Package/ruby-readline/install
        ( cd $(PKG_INSTALL_DIR); $(TAR) -cf - \
                usr/lib/ruby/$(PKG_LIBVER)/*/readline.so \
-               usr/lib/ruby/$(PKG_LIBVER)/irb/completion.rb \
-               usr/lib/ruby/$(PKG_LIBVER)/irb/ext/save-history.rb \
        ) | ( cd $(1); $(TAR) -xf - )
 endef