NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

These patches fix some minor problems with GNU Readline package.

Browse Source 
patch-1 will make the package selection default=n (since it's not necessary)
 patch-2 will fix the readline.mk makefile to better follow buildroot style.

This is a cleanup only. But adds the 'readline-target' makefile target to also
install readline .so files to the target in addition to the full install in the
staging area.

http://bugs.busybox.net/view.php?id=300
This commit is contained in:
Eric Andersen 2005-06-23 22:49:33 +00:00
parent 2605b7410f
commit 68886b0aac
2 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/readline/Config.in
View File

@ -1,7 +1,7 @@
# #
config BR2_READLINE config BR2_READLINE
bool "readline" bool "readline"
default y default n
help help
Enable GNU readline support? Enable GNU readline support?

98
package/readline/readline.mk
View File

@ -1,80 +1,80 @@
############################################################# #############################################################
# #
# build GNU readline # build GNU readline
# #
############################################################# #############################################################
READLINE_VER:=5.0 READLINE_VER:=5.0
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_DIR1:=$(TOOL_BUILD_DIR)/readline-$(READLINE_VER) READLINE_DIR:=$(BUILD_DIR)/readline-$(READLINE_VER)
READLINE_DIR1:=$(BUILD_DIR)/readline-$(READLINE_VER)
#READLINE_DIR2:=$(BUILD_DIR)/readline-$(READLINE_VER)
READLINE_CAT:=zcat READLINE_CAT:=zcat
##READLINE_BINARY:=readline
##READLINE_TARGET_BINARY:=usr/bin/readline
#READLINE_BINARY:=libreadline.a
READLINE_BINARY:=libhistory.so.$(READLINE_VER) READLINE_BINARY:=libhistory.so.$(READLINE_VER)
READLINE_TARGET_BINARY:=$(TARGET_DIR)/lib/$(READLINE_BINARY) READLINE_TARGET_BINARY:=$(TARGET_DIR)/lib/$(READLINE_BINARY)
#READLINE_TARGET_BINARY:=$(DEST_DIR)/usr/lib/libreadline.a
$(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_DIR1)/.unpacked: $(DL_DIR)/$(READLINE_SOURCE) $(READLINE_DIR)/.unpacked: $(DL_DIR)/$(READLINE_SOURCE)
$(READLINE_CAT) $(DL_DIR)/$(READLINE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - mkdir -p $(READLINE_DIR)
tar -C $(BUILD_DIR) -zxvf $(DL_DIR)/$(READLINE_SOURCE)
# patch to fix old autoconf # patch to fix old autoconf
patch -d $(READLINE_DIR1) -p1 -u < $(BASE_DIR)/package/readline/readline5.patch patch -d $(READLINE_DIR) -p1 -u < $(BASE_DIR)/package/readline/readline5.patch
touch $(READLINE_DIR1)/.unpacked touch $(READLINE_DIR)/.unpacked
$(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked
# --target=$(GNU_HOST_NAME) \ mkdir -p $(READLINE_DIR)
# gnu-host-name: $(GNU_HOST_NAME) powerpc-pc-linux-gnu (cd $(READLINE_DIR); rm -rf config.cache; \
# --host=powerpc-linux-uclibc \ $(READLINE_DIR)/configure \
# --program-prefix=$(TARGET_CROSS) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
$(READLINE_DIR1)/.configured: $(READLINE_DIR1)/.unpacked --build=$(GNU_HOST_NAME) \
mkdir -p $(READLINE_DIR1) --prefix=$(STAGING_DIR) \
# gnu-host-name: $(GNU_HOST_NAME)
(cd $(READLINE_DIR1); rm -rf config.cache; \
$(READLINE_DIR1)/configure \
--build=powerpc-linux-uclibc \
--host=powerpc-linux-uclibc \
--prefix=$(STAGING_DIR) \
); );
touch $(READLINE_DIR1)/.configured touch $(READLINE_DIR)/.configured
# old: --prefix=$(TARGET_DIR) \
# oldest: --prefix=$(TARGET_DIR)/opt/vp \
# -SAJ changed HOSTCC to TARGET_CC $(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured
$(READLINE_DIR1)/$(READLINE_BINARY): $(READLINE_DIR1)/.configured $(MAKE) -C $(READLINE_DIR)
$(MAKE) -C $(READLINE_DIR1)
$(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR1)/$(READLINE_BINARY) $(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/.configured
$(MAKE) -C $(READLINE_DIR1) install $(MAKE) -C $(READLINE_DIR) install
readline: $(STAGING_DIR)/$(READLINE_TARGET_BINARY) # Install to Staging area
# VP- do these post-install steps to clean up runtime env. readline: $(READLINE_DIR)/.configured
# VP- remove static libs from runtime environment BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) CC=$(TARGET_CC) \
# also install .so library files to target root $(MAKE1) \
$(MAKE) -C $(READLINE_DIR1) install-shared prefix=$(STAGING_DIR) \
### rm $(TARGET_DIR)/lib/libreadline.a exec_prefix=$(STAGING_DIR) \
## #rm $(TARGET_DIR)/lib/libhistory.a bindir=$(STAGING_DIR)/bin \
# VP- remove backup versions runtime environment sbindir=$(STAGING_DIR)/sbin \
## #rm $(TARGET_DIR)/lib/libreadline*old libexecdir=$(STAGING_DIR)/lib \
## #rm $(TARGET_DIR)/lib/libhistory*old datadir=$(STAGING_DIR)/usr/share \
sysconfdir=$(STAGING_DIR)/etc \
localstatedir=$(STAGING_DIR)/var \
libdir=$(STAGING_DIR)/lib \
infodir=$(STAGING_DIR)/info \
mandir=$(STAGING_DIR)/man \
includedir=$(STAGING_DIR)/include \
-C $(READLINE_DIR) install;
# Install only run-time to Target directory
readline-target: $(READLINE_DIR)/.configured
BUILD_CC=$(TARGET_CC) HOSTCC=$(HOSTCC) CC=$(TARGET_CC) \
$(MAKE1) \
prefix=$(TARGET_DIR) \
libdir=$(TARGET_DIR)/lib \
-C $(READLINE_DIR) install-shared
readline-clean: readline-clean:
$(MAKE) -C $(READLINE_DIR1) uninstall $(MAKE) -C $(READLINE_DIR) uninstall
-$(MAKE) -C $(READLINE_DIR1) clean -$(MAKE) -C $(READLINE_DIR) clean
readline-dirclean: readline-dirclean:
rm -rf $(READLINE_DIR1) rm -rf $(READLINE_DIR)
readline-source: $(DL_DIR)/$(READLINE_SOURCE) $(READLINE_DIR1)/.unpacked readline-source: $(DL_DIR)/$(READLINE_SOURCE) $(READLINE_DIR)/.unpacked
ifeq ($(strip $(BR2_READLINE)),y) ifeq ($(strip $(BR2_READLINE)),y)
TARGETS+=readline TARGETS+=readline