version bump / cleanup

diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index 2f0c22e65d67eddaf36925ce2619217c83f79a27..c4781548b1cc9c11f43ca0a675f49f575ab6f163 100644 (file)
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -3,7 +3,7 @@
 # build GNU readline
 #
 #############################################################
-READLINE_VER:=5.0
+READLINE_VER:=5.1
 READLINE_SITE:=ftp://ftp.cwru.edu/pub/bash
 READLINE_SOURCE:=readline-$(READLINE_VER).tar.gz
 READLINE_DIR:=$(BUILD_DIR)/readline-$(READLINE_VER)
@@ -11,31 +11,27 @@ READLINE_CAT:=zcat
 READLINE_BINARY:=libhistory.a
 READLINE_TARGET_BINARY:=lib/$(READLINE_BINARY)
 
-
-
 $(DL_DIR)/$(READLINE_SOURCE):
        $(WGET) -P $(DL_DIR) $(READLINE_SITE)/$(READLINE_SOURCE)
 
 $(READLINE_DIR)/.unpacked: $(DL_DIR)/$(READLINE_SOURCE)
        mkdir -p $(READLINE_DIR)
-       tar  -C $(BUILD_DIR) -zxvf $(DL_DIR)/$(READLINE_SOURCE)
-       # patch to fix old autoconf
-       patch -d $(READLINE_DIR) -p1 -u  < $(BASE_DIR)/package/readline/readline5.patch
+       tar -C $(BUILD_DIR) -zxf $(DL_DIR)/$(READLINE_SOURCE)
+       $(CONFIG_UPDATE) $(READLINE_DIR)
        touch $(READLINE_DIR)/.unpacked
 
 $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked
-       mkdir -p $(READLINE_DIR)
        (cd $(READLINE_DIR); rm -rf config.cache; \
-               $(READLINE_DIR)/configure \
-                --target=$(GNU_TARGET_NAME) \
-                --host=$(GNU_TARGET_NAME) \
-                --build=$(GNU_HOST_NAME)  \
-                --prefix=$(STAGING_DIR)  \
-               --disable-shared \
+               $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               ./configure \
+               --target=$(GNU_TARGET_NAME) \
+               --host=$(GNU_TARGET_NAME) \
+               --build=$(GNU_HOST_NAME) \
+               --prefix=$(STAGING_DIR) \
        );
        touch $(READLINE_DIR)/.configured
 
-
 $(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured
        $(MAKE)  -C $(READLINE_DIR)
        touch -c $(READLINE_DIR)/$(READLINE_BINARY)

diff --git a/package/readline/readline5.patch b/package/readline/readline5.patch
deleted file mode 100644 (file)
index 083ac78..0000000
--- a/package/readline/readline5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN orig-readline/support/config.sub readline-5.0/support/config.sub
---- orig-readline/support/config.sub   2003-09-10 09:16:12.000000000 -0400
-+++ readline-5.0/support/config.sub    2004-11-23 14:54:59.000000000 -0500
-@@ -1115,7 +1115,7 @@
-             | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
--            | -powermax* | -dnix*)
-+            | -powermax* | -dnix* | -uclibc*)
-       # Remember, each alternative MUST END IN *, to match a version number.
-               ;;
-       -qnx*)