summaryrefslogtreecommitdiffstats
path: root/package/readline/readline.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/readline/readline.mk')
-rw-r--r--package/readline/readline.mk16
1 files changed, 11 insertions, 5 deletions
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index c4887155b..4506ca1f4 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -3,8 +3,8 @@
# build GNU readline
#
#############################################################
-READLINE_VERSION:=5.1
-READLINE_SITE:=ftp://ftp.cwru.edu/pub/bash
+READLINE_VERSION:=5.2
+READLINE_SITE:=$(BR2_GNU_MIRROR)/readline
READLINE_SOURCE:=readline-$(READLINE_VERSION).tar.gz
READLINE_DIR:=$(BUILD_DIR)/readline-$(READLINE_VERSION)
READLINE_CAT:=$(ZCAT)
@@ -21,6 +21,7 @@ readline-source: $(DL_DIR)/$(READLINE_SOURCE)
$(READLINE_DIR)/.unpacked: $(DL_DIR)/$(READLINE_SOURCE)
mkdir -p $(READLINE_DIR)
tar -C $(BUILD_DIR) -zxf $(DL_DIR)/$(READLINE_SOURCE)
+ toolchain/patch-kernel.sh $(READLINE_DIR) package/readline/ readline??-???
$(CONFIG_UPDATE) $(READLINE_DIR)
$(CONFIG_UPDATE) $(READLINE_DIR)/support
touch $@
@@ -51,7 +52,7 @@ $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked
touch $@
$(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured
- $(MAKE) -C $(READLINE_DIR)
+ $(MAKE) -C $(READLINE_DIR) SHLIB_LIBS="-lncurses"
ls $(READLINE_DIR)/$(READLINE_BINARY)
touch -c $@
@@ -72,8 +73,13 @@ $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY): $(READLINE_DIR)/$(READLINE_BINAR
BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \
$(MAKE1) DESTDIR=$(TARGET_DIR) \
-C $(READLINE_DIR) install-shared uninstall-doc
+ chmod 775 $(TARGET_DIR)/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/lib/libhistory.so.$(READLINE_VERSION)
+ $(STRIPCMD) $(TARGET_DIR)/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/lib/libhistory.so.$(READLINE_VERSION)
+ifneq ($(strip $(BR2_PACKAGE_READLINE_HEADERS)),y)
+ rm -rf $(TARGET_DIR)/usr/include/readline
+endif
-readline: $(STAGING_DIR)/usr/include/readline/readline.h
+readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h
readline-clean:
$(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall
@@ -82,7 +88,7 @@ readline-clean:
readline-dirclean:
rm -rf $(READLINE_DIR)
-readline-target: $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)
+readline-target: readline $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)
readline-target-clean:
$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall