X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Flibs%2Flibreadline%2FMakefile;h=5a63271e7575a2b8b4731e8d51e572e92c356cb7;hb=23b3b67e42d9c3c00cac1f3598a2802380f8c2ec;hp=320d2e2df60da18997a6a480e29e864f3081b0bf;hpb=a81ef914e0b41afc1dfd4292b8352e33f22dde22;p=openwrt-github%2F.git

diff --git a/package/libs/libreadline/Makefile b/package/libs/libreadline/Makefile
index 320d2e2df6..5a63271e75 100644
--- a/package/libs/libreadline/Makefile
+++ b/package/libs/libreadline/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,16 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=readline
-PKG_VERSION:=5.2
-PKG_RELEASE:=2
+PKG_VERSION:=6.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/readline
-PKG_MD5SUM:=e39331f32ad14009b9ff49cc10c5e751
+PKG_MD5SUM:=33c8fb279e981274f485fd91da77e94a
 
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=COPYING
 
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libreadline
@@ -37,10 +39,13 @@ define Package/libreadline/description
 endef
 
 define Build/Configure
+	$(CP) $(SCRIPT_DIR)/config.guess $(SCRIPT_DIR)/config.sub $(PKG_BUILD_DIR)/support/
 	$(call Build/Configure/Default, \
 		--enable-shared \
 		--enable-static \
 		--without-curses \
+		bash_cv_wcwidth_broken=no \
+		bash_cv_func_sigsetjmp=yes \
 	)
 endef
 
@@ -49,7 +54,7 @@ TARGET_CPPFLAGS:=-I. -I.. $(TARGET_CPPFLAGS)
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
@@ -58,12 +63,12 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so,so.5,so.5.2} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so,so.6,so.6.3} $(1)/usr/lib/
 endef
 
 define Package/libreadline/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{so,so.5,so.5.2} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{so,so.6,so.6.3} $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libreadline))