readline: update to version 6.2, enable parallel builds

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

diff --git a/package/libs/libreadline/Makefile b/package/libs/libreadline/Makefile
index 320d2e2..0ce11a3 100644 (file)
--- a/package/libs/libreadline/Makefile
+++ b/package/libs/libreadline/Makefile
@@ -8,16 +8,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=readline
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=readline

-PKG_VERSION:=5.2
-PKG_RELEASE:=2
+PKG_VERSION:=6.2
+PKG_RELEASE:=1

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/readline
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/readline

-PKG_MD5SUM:=e39331f32ad14009b9ff49cc10c5e751
+PKG_MD5SUM:=67948acb2ca081f23359d0256e9a271c

 
 

-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=GPLv3

 PKG_LICENSE_FILES:=COPYING
 
 PKG_LICENSE_FILES:=COPYING
 

+PKG_BUILD_PARALLEL:=1
+

 include $(INCLUDE_DIR)/package.mk
 
 define Package/libreadline
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libreadline


@@ -37,6 +39,7 @@ define Package/libreadline/description
 endef
 
 define Build/Configure
 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 \
        $(call Build/Configure/Default, \
                --enable-shared \
                --enable-static \


@@ -49,7 +52,7 @@ TARGET_CPPFLAGS:=-I. -I.. $(TARGET_CPPFLAGS)
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
 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
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef


@@ -58,12 +61,12 @@ define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/
        $(INSTALL_DIR) $(1)/usr/lib
        $(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.2} $(1)/usr/lib/

 endef
 
 define Package/libreadline/install
        $(INSTALL_DIR) $(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.2} $(1)/usr/lib/

 endef
 
 $(eval $(call BuildPackage,libreadline))
 endef
 
 $(eval $(call BuildPackage,libreadline))

diff --git a/package/libs/libreadline/patches/100-fix_avr32_compile b/package/libs/libreadline/patches/100-fix_avr32_compile
deleted file mode 100644 (file)
index 4d55b80..0000000
--- a/package/libs/libreadline/patches/100-fix_avr32_compile
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/support/config.sub
-+++ b/support/config.sub
-@@ -228,7 +228,7 @@ case $basic_machine in
-       | a29k \
-       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
--      | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+      | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-       | clipper \
-       | d10v | d30v | dlx | dsp16xx \
-       | fr30 | frv \
-@@ -293,7 +293,7 @@ case $basic_machine in
-       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-       | amd64-* \
-       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
--      | avr-* \
-+      | avr-* | avr32-* \
-       | bs2000-* \
-       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
-       | clipper-* | cydra-* \