From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 16 Jul 2010 03:43:38 +0000 (+0000)
Subject: [packages] ruby: add dependency on libpthread to libruby, use minor version for libra... 
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=55b505fb5118202cca1830666160a93962761282;p=packages.git

[packages] ruby: add dependency on libpthread to libruby, use minor version for library path (closes: #7608)


git-svn-id: svn://svn.openwrt.org/openwrt/packages@22226 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index c85aa8895..894904689 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -15,12 +15,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruby
-PKG_LIBVER:=1.9.1
-PKG_VERSION:=$(PKG_LIBVER)-p376
-PKG_RELEASE:=2
+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_SOURCE_URL:=ftp://ftp.ruby-lang.org/pub/ruby/$(PKG_LIBVER)/
 PKG_MD5SUM:=e019ae9c643c5efe91be49e29781fb94
 
 PKG_BUILD_DEPENDS:=ruby/host
@@ -59,6 +60,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,9 +205,7 @@ CONFIGURE_ARGS += \
 	--disable-rpath \
 	--enable-ipv6 \
 	--enable-wide-getaddrinfo \
-
-CONFIGURE_VARS += \
-	ac_cv_func_setpgrp_void=yes
+	--with-ruby-version=minor \
 
 TARGET_LDFLAGS += -L$(PKG_BUILD_DIR)