aboutsummaryrefslogtreecommitdiff
path: root/package/readline
diff options
context:
space:
mode:
authorGravatar Mike Frysinger <vapier@gentoo.org>2005-12-13 04:58:17 +0000
committerGravatar Mike Frysinger <vapier@gentoo.org>2005-12-13 04:58:17 +0000
commit05e5438fe3d73e4b067b2436fa5e156bd49a29a6 (patch)
treecac559a39fd74b64151c9e1b1ae99fcb6eb81094 /package/readline
parent9145e9de334bd4ca8818b4ac1f1813728e17e239 (diff)
downloadbuildroot-05e5438fe3d73e4b067b2436fa5e156bd49a29a6.tar.gz
buildroot-05e5438fe3d73e4b067b2436fa5e156bd49a29a6.tar.bz2
version bump / cleanup
Diffstat (limited to 'package/readline')
-rw-r--r--package/readline/readline.mk24
-rw-r--r--package/readline/readline5.patch12
2 files changed, 10 insertions, 26 deletions
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index 2f0c22e65d..c4781548b1 100644
--- 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
index 083ac789c4..0000000000
--- 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*)