From fe6e67ba96b7fedf91faac7992813f7233a5e58b Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 27 Jan 2010 02:08:58 +0100 Subject: [PATCH] readline: convert to autotools infrastructure [Peter: renamed patches to get picked up by infrastructure] Signed-off-by: Lionel Landwerlin Signed-off-by: Peter Korsgaard --- CHANGES | 6 +- package/readline/readline.mk | 107 ++++-------------- .../{readline52-001 => readline52-001.patch} | 0 .../{readline52-002 => readline52-002.patch} | 0 .../{readline52-003 => readline52-003.patch} | 0 .../{readline52-004 => readline52-004.patch} | 0 .../{readline52-005 => readline52-005.patch} | 0 .../{readline52-006 => readline52-006.patch} | 0 .../{readline52-007 => readline52-007.patch} | 0 .../{readline52-008 => readline52-008.patch} | 0 .../{readline52-009 => readline52-009.patch} | 0 .../{readline52-010 => readline52-010.patch} | 0 .../{readline52-011 => readline52-011.patch} | 0 .../{readline52-012 => readline52-012.patch} | 0 14 files changed, 24 insertions(+), 89 deletions(-) rename package/readline/{readline52-001 => readline52-001.patch} (100%) rename package/readline/{readline52-002 => readline52-002.patch} (100%) rename package/readline/{readline52-003 => readline52-003.patch} (100%) rename package/readline/{readline52-004 => readline52-004.patch} (100%) rename package/readline/{readline52-005 => readline52-005.patch} (100%) rename package/readline/{readline52-006 => readline52-006.patch} (100%) rename package/readline/{readline52-007 => readline52-007.patch} (100%) rename package/readline/{readline52-008 => readline52-008.patch} (100%) rename package/readline/{readline52-009 => readline52-009.patch} (100%) rename package/readline/{readline52-010 => readline52-010.patch} (100%) rename package/readline/{readline52-011 => readline52-011.patch} (100%) rename package/readline/{readline52-012 => readline52-012.patch} (100%) diff --git a/CHANGES b/CHANGES index 97c55018ac..383f0a81a4 100644 --- a/CHANGES +++ b/CHANGES @@ -8,9 +8,9 @@ busybox, directfb, dnsmasq, e2fsprogs, gstreamer, gperf, gst-plugins-bad, gvfs, flex, hal, iptables, iw, jpeg, kismet, libfuse, libglib2, libpcap, libungif, libxml2, lighttpd, mesa, mpg123, - mtd-utils, neon, netstat-nat, openvpn, pcre, qt, rpm, sawman, sdl, - sdl_ttf, ser2net, sqlite, sshfs, tremor, u-boot, usb_modeswitch, - usbutils, webkit, wpa_supplicant, xfsprogs, zlib + mtd-utils, neon, netstat-nat, openvpn, pcre, qt, readline, rpm, + sawman, sdl, sdl_ttf, ser2net, sqlite, sshfs, tremor, u-boot, + usb_modeswitch, usbutils, webkit, wpa_supplicant, xfsprogs, zlib Issues resolved (http://bugs.uclibc.org): diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 34c02d8498..641cd712e1 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -3,89 +3,24 @@ # build GNU readline # ############################################################# -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) -READLINE_BINARY:=libhistory.a -READLINE_SHARED_BINARY:=libhistory.so -READLINE_TARGET_BINARY:=usr/lib/$(READLINE_BINARY) -READLINE_TARGET_SHARED_BINARY:=usr/lib/$(READLINE_SHARED_BINARY) - -$(DL_DIR)/$(READLINE_SOURCE): - $(call DOWNLOAD,$(READLINE_SITE),$(READLINE_SOURCE)) - -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 $@ - -$(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked - (cd $(READLINE_DIR); rm -rf config.cache; \ - bash_cv_func_sigsetjmp=yes \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --with-shared \ - --includedir=/usr/include \ - --mandir=/usr/man \ - --infodir=/usr/info \ - ) - touch $@ - -$(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured - $(MAKE) -C $(READLINE_DIR) SHLIB_LIBS="-lncurses" - ls $(READLINE_DIR)/$(READLINE_BINARY) - touch -c $@ - -$(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/.configured - $(MAKE) -C $(READLINE_DIR) install - touch -c $@ - -# Install to Staging area -$(STAGING_DIR)/usr/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY) - BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \ - $(MAKE1) DESTDIR=$(STAGING_DIR) -C $(READLINE_DIR) install - touch -c $@ - -# Install to Target directory -$(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY): $(READLINE_DIR)/$(READLINE_BINARY) - # make sure we don't end up with lib{readline,history}...old - $(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall - BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \ - $(MAKE1) DESTDIR=$(TARGET_DIR) \ - -C $(READLINE_DIR) install-shared uninstall-doc - chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION) - $(STRIPCMD) $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION) - -readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY) - -readline-clean: - -$(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall - -$(MAKE) -C $(READLINE_DIR) DESTDIR=$(TARGET_DIR) uninstall - -$(MAKE) -C $(READLINE_DIR) clean - -readline-dirclean: - rm -rf $(READLINE_DIR) - -ifeq ($(BR2_PACKAGE_READLINE),y) -TARGETS+=readline -endif +READLINE_VERSION = 5.2 +READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz +READLINE_SITE = $(BR2_GNU_MIRROR)/readline +READLINE_INSTALL_STAGING = YES +READLINE_INSTALL_TARGET = YES + +READLINE_DEPENDENCIES = ncurses + +READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes + +define READLINE_INSTALL_TARGET_CMDS + $(MAKE1) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall + $(MAKE1) DESTDIR=$(TARGET_DIR) -C $(@D) install-shared uninstall-doc + chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) \ + $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION) + $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) \ + $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) \ + $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION) +endef + +$(eval $(call AUTOTARGETS,package,readline)) diff --git a/package/readline/readline52-001 b/package/readline/readline52-001.patch similarity index 100% rename from package/readline/readline52-001 rename to package/readline/readline52-001.patch diff --git a/package/readline/readline52-002 b/package/readline/readline52-002.patch similarity index 100% rename from package/readline/readline52-002 rename to package/readline/readline52-002.patch diff --git a/package/readline/readline52-003 b/package/readline/readline52-003.patch similarity index 100% rename from package/readline/readline52-003 rename to package/readline/readline52-003.patch diff --git a/package/readline/readline52-004 b/package/readline/readline52-004.patch similarity index 100% rename from package/readline/readline52-004 rename to package/readline/readline52-004.patch diff --git a/package/readline/readline52-005 b/package/readline/readline52-005.patch similarity index 100% rename from package/readline/readline52-005 rename to package/readline/readline52-005.patch diff --git a/package/readline/readline52-006 b/package/readline/readline52-006.patch similarity index 100% rename from package/readline/readline52-006 rename to package/readline/readline52-006.patch diff --git a/package/readline/readline52-007 b/package/readline/readline52-007.patch similarity index 100% rename from package/readline/readline52-007 rename to package/readline/readline52-007.patch diff --git a/package/readline/readline52-008 b/package/readline/readline52-008.patch similarity index 100% rename from package/readline/readline52-008 rename to package/readline/readline52-008.patch diff --git a/package/readline/readline52-009 b/package/readline/readline52-009.patch similarity index 100% rename from package/readline/readline52-009 rename to package/readline/readline52-009.patch diff --git a/package/readline/readline52-010 b/package/readline/readline52-010.patch similarity index 100% rename from package/readline/readline52-010 rename to package/readline/readline52-010.patch diff --git a/package/readline/readline52-011 b/package/readline/readline52-011.patch similarity index 100% rename from package/readline/readline52-011 rename to package/readline/readline52-011.patch diff --git a/package/readline/readline52-012 b/package/readline/readline52-012.patch similarity index 100% rename from package/readline/readline52-012 rename to package/readline/readline52-012.patch -- 2.30.2