[package] ruby: fix path to libiconv

[openwrt/svn-archive/archive.git] / lang / ruby / Makefile

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 2345c86af0b9f6504fd51e77ae1b91ff85654678..dba34b9f9bd80c0d7f53ed106fce925cb959e4c8 100644 (file)
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,10 +1,9 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 #
 # To Do:
@@ -16,15 +15,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruby
-PKG_LIBVER:=1.9.1
-PKG_VERSION:=$(PKG_LIBVER)-p243
-PKG_RELEASE:=1
+PKG_VERSION:=1.9.1-p376
+PKG_RELEASE:=3
+
+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:=66d4f8403d13623051091347764881a0
+PKG_SOURCE_URL:=ftp://ftp.ruby-lang.org/pub/ruby/$(PKG_LIBVER)/
+PKG_MD5SUM:=e019ae9c643c5efe91be49e29781fb94
 
 PKG_BUILD_DEPENDS:=ruby/host
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
@@ -60,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
@@ -204,16 +207,21 @@ 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)
+       ( cd $(PKG_BUILD_DIR) ; \
+               autoconf ; \
+       )
+endef
 
 define Package/ruby/install
        $(INSTALL_DIR) $(1)/usr/bin
@@ -244,9 +252,7 @@ define Package/ruby-core/install
                $(1)/usr/lib/ruby/$(PKG_LIBVER)/openssl.rb \
                $(1)/usr/lib/ruby/$(PKG_LIBVER)/*/openssl.so \
                $(1)/usr/lib/ruby/$(PKG_LIBVER)/drb/ssl.rb \
-               $(1)/usr/lib/ruby/$(PKG_LIBVER)/net/ftptls.rb \
                $(1)/usr/lib/ruby/$(PKG_LIBVER)/net/https.rb \
-               $(1)/usr/lib/ruby/$(PKG_LIBVER)/net/telnets.rb \
                $(1)/usr/lib/ruby/$(PKG_LIBVER)/webrick/ssl.rb \
                \
                $(1)/usr/lib/ruby/$(PKG_LIBVER)/*/dl.so \
@@ -330,6 +336,8 @@ define Package/ruby-gdbm/install
 endef
 
 define Package/ruby-gems/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/gem $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/lib/ruby/$(PKG_LIBVER)
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rubygems.rb $(1)/usr/lib/ruby/$(PKG_LIBVER)/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ruby/$(PKG_LIBVER)/rubygems $(1)/usr/lib/ruby/$(PKG_LIBVER)/
@@ -374,9 +382,7 @@ define Package/ruby-openssl/install
                usr/lib/ruby/$(PKG_LIBVER)/openssl.rb \
                usr/lib/ruby/$(PKG_LIBVER)/*/openssl.so \
                usr/lib/ruby/$(PKG_LIBVER)/drb/ssl.rb \
-               usr/lib/ruby/$(PKG_LIBVER)/net/ftptls.rb \
                usr/lib/ruby/$(PKG_LIBVER)/net/https.rb \
-               usr/lib/ruby/$(PKG_LIBVER)/net/telnets.rb \
                usr/lib/ruby/$(PKG_LIBVER)/webrick/ssl.rb \
        ) | ( cd $(1); $(TAR) -xf - )
 endef
@@ -455,14 +461,6 @@ define Build/InstallDev
        ) | ( cd $(1); $(TAR) -xf - )
 endef
 
-define Build/Prepare
-$(call Build/Prepare/Default)
-       ( cd $(PKG_BUILD_DIR) ; \
-               autoconf ; \
-       )
-endef
-
-
 $(eval $(call BuildPackage,ruby))
 $(eval $(call BuildPackage,libruby))
 $(eval $(call BuildPackage,ruby-core))