version bump / cleanup

This commit is contained in:
Mike Frysinger 2005-12-13 04:58:17 +00:00
parent 9145e9de33
commit 05e5438fe3
2 changed files with 10 additions and 26 deletions

View File

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

View File

@ -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*)