All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2007-10-13 23:11 ulf at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: ulf at uclibc.org @ 2007-10-13 23:11 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-10-13 16:11:17 -0700 (Sat, 13 Oct 2007)
New Revision: 20248

Log:
Config update of Readline subdir

Modified:
   trunk/buildroot/package/readline/readline.mk


Changeset:
Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2007-10-13 23:09:49 UTC (rev 20247)
+++ trunk/buildroot/package/readline/readline.mk	2007-10-13 23:11:17 UTC (rev 20248)
@@ -22,6 +22,7 @@
 	mkdir -p $(READLINE_DIR)
 	tar -C $(BUILD_DIR) -zxf $(DL_DIR)/$(READLINE_SOURCE)
 	$(CONFIG_UPDATE) $(READLINE_DIR)
+	$(CONFIG_UPDATE) $(READLINE_DIR)/support
 	touch $@
 
 $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2009-01-30  9:50 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2009-01-30  9:50 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2009-01-30 09:50:02 +0000 (Fri, 30 Jan 2009)
New Revision: 25158

Log:
readline: remove redundant BR2_PACKAGE_READLINE_HEADERS configuration

Header files on target is globally controlled by BR2_HAVE_DEVFILES.

Modified:
   trunk/buildroot/package/readline/Config.in
   trunk/buildroot/package/readline/readline.mk


Changeset:
Modified: trunk/buildroot/package/readline/Config.in
===================================================================
--- trunk/buildroot/package/readline/Config.in	2009-01-30 08:53:08 UTC (rev 25157)
+++ trunk/buildroot/package/readline/Config.in	2009-01-30 09:50:02 UTC (rev 25158)
@@ -9,10 +9,3 @@
 	depends on BR2_READLINE
 	help
 	  Say yes here to install the readline libraries on the target.
-
-config BR2_PACKAGE_READLINE_HEADERS
-	bool "readline headers for the target"
-	depends on BR2_PACKAGE_READLINE_TARGET
-	help
-	  Say yes here to install the readline headers and documentation
-	  on the target.

Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2009-01-30 08:53:08 UTC (rev 25157)
+++ trunk/buildroot/package/readline/readline.mk	2009-01-30 09:50:02 UTC (rev 25158)
@@ -75,9 +75,6 @@
 		-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)
-ifneq ($(BR2_PACKAGE_READLINE_HEADERS),y)
-	rm -rf $(TARGET_DIR)/usr/include/readline
-endif
 
 readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h
 

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2008-03-31 14:32 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2008-03-31 14:32 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2008-03-31 07:32:38 -0700 (Mon, 31 Mar 2008)
New Revision: 21595

Log:
readline: ignore errors in target-clean target


Modified:
   trunk/buildroot/package/readline/readline.mk


Changeset:
Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2008-03-31 14:28:38 UTC (rev 21594)
+++ trunk/buildroot/package/readline/readline.mk	2008-03-31 14:32:38 UTC (rev 21595)
@@ -91,7 +91,7 @@
 readline-target: readline $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)
 
 readline-target-clean:
-	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall
+	-$(MAKE) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall
 
 ifeq ($(strip $(BR2_READLINE)),y)
 TARGETS+=readline

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
  2008-03-06 18:22 ninevoltz at uclibc.org
@ 2008-03-06 23:59 ` Hamish Moffatt
  0 siblings, 0 replies; 15+ messages in thread
From: Hamish Moffatt @ 2008-03-06 23:59 UTC (permalink / raw)
  To: buildroot

On Thu, Mar 06, 2008 at 10:22:31AM -0800, ninevoltz at uclibc.org wrote:
> Author: ninevoltz
> Date: 2008-03-06 10:22:31 -0800 (Thu, 06 Mar 2008)
> New Revision: 21222
> 
> Log:
> fixes for readline makefile
> 
> Modified:
>    trunk/buildroot/package/readline/readline.mk

> -READLINE_TARGET_BINARY:=lib/$(READLINE_BINARY)
> -READLINE_TARGET_SHARED_BINARY:=lib/$(READLINE_SHARED_BINARY)
> +READLINE_TARGET_BINARY:=usr/lib/$(READLINE_BINARY)
> +READLINE_TARGET_SHARED_BINARY:=usr/lib/$(READLINE_SHARED_BINARY)

Why, again?

readline is in /lib on my Debian system, fwiw.


Hamish
-- 
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2008-03-06 18:22 ninevoltz at uclibc.org
  2008-03-06 23:59 ` Hamish Moffatt
  0 siblings, 1 reply; 15+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:22 UTC (permalink / raw)
  To: buildroot

Author: ninevoltz
Date: 2008-03-06 10:22:31 -0800 (Thu, 06 Mar 2008)
New Revision: 21222

Log:
fixes for readline makefile

Modified:
   trunk/buildroot/package/readline/readline.mk


Changeset:
Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2008-03-06 18:22:10 UTC (rev 21221)
+++ trunk/buildroot/package/readline/readline.mk	2008-03-06 18:22:31 UTC (rev 21222)
@@ -10,8 +10,8 @@
 READLINE_CAT:=$(ZCAT)
 READLINE_BINARY:=libhistory.a
 READLINE_SHARED_BINARY:=libhistory.so
-READLINE_TARGET_BINARY:=lib/$(READLINE_BINARY)
-READLINE_TARGET_SHARED_BINARY:=lib/$(READLINE_SHARED_BINARY)
+READLINE_TARGET_BINARY:=usr/lib/$(READLINE_BINARY)
+READLINE_TARGET_SHARED_BINARY:=usr/lib/$(READLINE_SHARED_BINARY)
 
 $(DL_DIR)/$(READLINE_SOURCE):
 	$(WGET) -P $(DL_DIR) $(READLINE_SITE)/$(READLINE_SOURCE)
@@ -39,7 +39,7 @@
 		--exec-prefix=/usr \
 		--bindir=/usr/bin \
 		--sbindir=/usr/sbin \
-		--libdir=/lib \
+		--libdir=/usr/lib \
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
@@ -73,8 +73,8 @@
 	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)
+	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)
 ifneq ($(strip $(BR2_PACKAGE_READLINE_HEADERS)),y)
 	rm -rf $(TARGET_DIR)/usr/include/readline
 endif

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2008-02-06  1:26 hamish at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: hamish at uclibc.org @ 2008-02-06  1:26 UTC (permalink / raw)
  To: buildroot

Author: hamish
Date: 2008-02-05 17:26:58 -0800 (Tue, 05 Feb 2008)
New Revision: 20949

Log:
Commit the new upstream patches and remove the old


Added:
   trunk/buildroot/package/readline/readline52-001
   trunk/buildroot/package/readline/readline52-002
   trunk/buildroot/package/readline/readline52-003
   trunk/buildroot/package/readline/readline52-004
   trunk/buildroot/package/readline/readline52-005
   trunk/buildroot/package/readline/readline52-006
   trunk/buildroot/package/readline/readline52-007
   trunk/buildroot/package/readline/readline52-008
   trunk/buildroot/package/readline/readline52-009
   trunk/buildroot/package/readline/readline52-010
   trunk/buildroot/package/readline/readline52-011
   trunk/buildroot/package/readline/readline52-012

Removed:
   trunk/buildroot/package/readline/readline51-001
   trunk/buildroot/package/readline/readline51-002
   trunk/buildroot/package/readline/readline51-003
   trunk/buildroot/package/readline/readline51-004


Changeset:

Sorry, the patch is too large to include (1068 lines).
Please use ViewCVS to see it!

http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=20949

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2008-02-06  1:26 hamish at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: hamish at uclibc.org @ 2008-02-06  1:26 UTC (permalink / raw)
  To: buildroot

Author: hamish
Date: 2008-02-05 17:26:03 -0800 (Tue, 05 Feb 2008)
New Revision: 20948

Log:
Upgrade readline to 5.2, including all current upstream patches.
Fetch it from $(BR2_GNU_MIRROR).
Note proper dependency on ncurses.



Modified:
   trunk/buildroot/package/readline/Config.in
   trunk/buildroot/package/readline/readline.mk
   trunk/buildroot/package/readline/readline51-001
   trunk/buildroot/package/readline/readline51-002
   trunk/buildroot/package/readline/readline51-003
   trunk/buildroot/package/readline/readline51-004


Changeset:
Modified: trunk/buildroot/package/readline/Config.in
===================================================================
--- trunk/buildroot/package/readline/Config.in	2008-02-06 00:55:05 UTC (rev 20947)
+++ trunk/buildroot/package/readline/Config.in	2008-02-06 01:26:03 UTC (rev 20948)
@@ -9,5 +9,11 @@
 	bool "readline for the target"
 	depends on BR2_READLINE
 	help
-	  Say yes here to install the readline libraries and headers
+	  Say yes here to install the readline libraries on the target.
+
+config BR2_PACKAGE_READLINE_HEADERS
+	bool "readline headers for the target"
+	depends on BR2_PACKAGE_READLINE_TARGET
+	help
+	  Say yes here to install the readline headers and documentation
 	  on the target.

Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2008-02-06 00:55:05 UTC (rev 20947)
+++ trunk/buildroot/package/readline/readline.mk	2008-02-06 01:26:03 UTC (rev 20948)
@@ -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_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 @@
 	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 @@
 	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-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

Modified: trunk/buildroot/package/readline/readline51-001
===================================================================
--- trunk/buildroot/package/readline/readline51-001	2008-02-06 00:55:05 UTC (rev 20947)
+++ trunk/buildroot/package/readline/readline51-001	2008-02-06 01:26:03 UTC (rev 20948)
@@ -1,77 +0,0 @@
-			   READLINE PATCH REPORT
-			   =====================
-
-Readline-Release: 5.1
-Patch-ID: readline51-001
-
-Bug-Reported-by: Andreas Schwab <schwab@suse.de>
-Bug-Reference-ID: <20051213141916.4014A394BFABD@sykes.suse.de>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00038.html
-
-Bug-Description:
-
-A problem with the readline callback interface can result in segmentation
-faults when using the delete-char function via a multiple-key sequence.
-Two consecutive calls to delete-char will crash the application calling
-readline.
-
-Patch:
-
-*** readline-5.1/readline.c	Mon Jul  4 22:29:35 2005
---- readline-5.1/readline.c	Tue Dec 20 17:38:29 2005
-***************
-*** 715,719 ****
-  	  rl_dispatching = 1;
-  	  RL_SETSTATE(RL_STATE_DISPATCHING);
-! 	  r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
-  	  RL_UNSETSTATE(RL_STATE_DISPATCHING);
-  	  rl_dispatching = 0;
---- 715,719 ----
-  	  rl_dispatching = 1;
-  	  RL_SETSTATE(RL_STATE_DISPATCHING);
-! 	  (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
-  	  RL_UNSETSTATE(RL_STATE_DISPATCHING);
-  	  rl_dispatching = 0;
-*** ../readline-5.1/text.c	Sat Sep 24 19:06:07 2005
---- text.c	Tue Dec 20 17:38:26 2005
-***************
-*** 1072,1077 ****
-       int count, key;
-  {
--   int r;
-- 
-    if (count < 0)
-      return (_rl_rubout_char (-count, key));
---- 1072,1075 ----
-***************
-*** 1091,1097 ****
-  	rl_forward_byte (count, key);
-  
-!       r = rl_kill_text (orig_point, rl_point);
-        rl_point = orig_point;
--       return r;
-      }
-    else
---- 1089,1094 ----
-  	rl_forward_byte (count, key);
-  
-!       rl_kill_text (orig_point, rl_point);
-        rl_point = orig_point;
-      }
-    else
-***************
-*** 1100,1105 ****
-  
-        new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
-!       return (rl_delete_text (rl_point, new_point));
-      }
-  }
-  
---- 1097,1103 ----
-  
-        new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
-!       rl_delete_text (rl_point, new_point);
-      }
-+   return 0;
-  }
-  

Modified: trunk/buildroot/package/readline/readline51-002
===================================================================
--- trunk/buildroot/package/readline/readline51-002	2008-02-06 00:55:05 UTC (rev 20947)
+++ trunk/buildroot/package/readline/readline51-002	2008-02-06 01:26:03 UTC (rev 20948)
@@ -1,43 +0,0 @@
-			   READLINE PATCH REPORT
-			   =====================
-
-Readline-Release: 5.1
-Patch-ID: readline51-002
-
-Bug-Reported-by: Mike Frysinger <vapier@gentoo.org>
-Bug-Reference-ID: <200601120613.11907.vapier@gentoo.org>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00045.html
-
-Bug-Description:
-
-Under some circumstances, Readline can use an incorrect setting for the flag
-that indicates whether or not the terminal can auto-wrap, resulting in line-
-wrapping errors.
-
-Patch:
-
-*** readline-5.1/terminal.c	Sat Nov 12 20:46:54 2005
---- readline-5.1/terminal.c	Tue Jan 31 10:57:54 2006
-***************
-*** 123,127 ****
-  
-  /* Non-zero means the terminal can auto-wrap lines. */
-! int _rl_term_autowrap;
-  
-  /* Non-zero means that this terminal has a meta key. */
---- 126,130 ----
-  
-  /* Non-zero means the terminal can auto-wrap lines. */
-! int _rl_term_autowrap = -1;
-  
-  /* Non-zero means that this terminal has a meta key. */
-***************
-*** 275,278 ****
---- 278,284 ----
-       int rows, cols;
-  {
-+   if (_rl_term_autowrap == -1)
-+     _rl_init_terminal_io (rl_terminal_name);
-+ 
-    if (rows > 0)
-      _rl_screenheight = rows;

Modified: trunk/buildroot/package/readline/readline51-003
===================================================================
--- trunk/buildroot/package/readline/readline51-003	2008-02-06 00:55:05 UTC (rev 20947)
+++ trunk/buildroot/package/readline/readline51-003	2008-02-06 01:26:03 UTC (rev 20948)
@@ -1,29 +0,0 @@
-			   READLINE PATCH REPORT
-			   =====================
-
-Readline-Release: 5.1
-Patch-ID: readline51-003
-
-Bug-Reported-by: Bob Rossi <bob@brasko.net>
-Bug-Reference-ID: <43F60606.80708@case.edu>
-Bug-Reference-URL:
-
-Bug-Description:
-
-In some cases, readline will reference freed memory when attempting to
-display a portion of the prompt.
-
-Patch:
-
-*** readline-5.1/readline.c	Tue Dec 20 17:38:29 2005
---- readline-5.1/readline.c	Fri Feb 17 22:54:22 2006
-***************
-*** 282,287 ****
---- 282,288 ----
-  {
-    FREE (rl_prompt);
-    rl_prompt = prompt ? savestring (prompt) : (char *)NULL;
-+   rl_display_prompt = rl_prompt ? rl_prompt : "";
-  
-    rl_visible_prompt_length = rl_expand_prompt (rl_prompt);
-    return 0;

Modified: trunk/buildroot/package/readline/readline51-004
===================================================================
--- trunk/buildroot/package/readline/readline51-004	2008-02-06 00:55:05 UTC (rev 20947)
+++ trunk/buildroot/package/readline/readline51-004	2008-02-06 01:26:03 UTC (rev 20948)
@@ -1,90 +0,0 @@
-			   READLINE PATCH REPORT
-			   =====================
-
-Readline-Release: 5.1
-Patch-ID: readline51-004
-
-Bug-Reported-by: Mike Stroyan <mike.stroyan@hp.com>
-Bug-Reference-ID: <20060203191607.GC27614@localhost>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00004.html
-
-Bug-Description:
-
-The displayed search prompt is corrupted when using non-incremental
-searches in vi and emacs mode if the prompt contains non-printing
-characters or spans multiple lines.  The prompt is expanded more than
-once; the second time without the escape sequences that protect non-
-printing characters from the length calculations.
-
-Patch:
-
-*** readline-5.1-patched/display.c	Wed Nov 30 14:05:02 2005
---- readline-5.1/display.c	Sat Feb 18 12:14:58 2006
-***************
-*** 1983,1993 ****
-       int pchar;
-  {
-    int len;
-!   char *pmt;
-  
-    rl_save_prompt ();
-  
-!   if (saved_local_prompt == 0)
-      {
-        len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0;
-        pmt = (char *)xmalloc (len + 2);
---- 1998,2012 ----
-       int pchar;
-  {
-    int len;
-!   char *pmt, *p;
-  
-    rl_save_prompt ();
-  
-!   /* We've saved the prompt, and can do anything with the various prompt
-!      strings we need before they're restored.  We want the unexpanded
-!      portion of the prompt string after any final newline. */
-!   p = rl_prompt ? strrchr (rl_prompt, '\n') : 0;
-!   if (p == 0)
-      {
-        len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0;
-        pmt = (char *)xmalloc (len + 2);
-***************
-*** 1998,2016 ****
-      }
-    else
-      {
-!       len = *saved_local_prompt ? strlen (saved_local_prompt) : 0;
-        pmt = (char *)xmalloc (len + 2);
-        if (len)
-! 	strcpy (pmt, saved_local_prompt);
-        pmt[len] = pchar;
-        pmt[len+1] = '\0';
-!       local_prompt = savestring (pmt);
-!       prompt_last_invisible = saved_last_invisible;
-!       prompt_visible_length = saved_visible_length + 1;
-!     }
-  
-    prompt_physical_chars = saved_physical_chars + 1;
-- 
-    return pmt;
-  }
-  
---- 2017,2033 ----
-      }
-    else
-      {
-!       p++;
-!       len = strlen (p);
-        pmt = (char *)xmalloc (len + 2);
-        if (len)
-! 	strcpy (pmt, p);
-        pmt[len] = pchar;
-        pmt[len+1] = '\0';
-!     }  
-  
-+   /* will be overwritten by expand_prompt, called from rl_message */
-    prompt_physical_chars = saved_physical_chars + 1;
-    return pmt;
-  }
-  

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
  2007-09-23  9:53 ulf at uclibc.org
@ 2007-09-23 11:14 ` Bernhard Fischer
  0 siblings, 0 replies; 15+ messages in thread
From: Bernhard Fischer @ 2007-09-23 11:14 UTC (permalink / raw)
  To: buildroot

On Sun, Sep 23, 2007 at 02:53:16AM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-09-23 02:53:12 -0700 (Sun, 23 Sep 2007)
>New Revision: 19956
>
>Log:
>Build readline as shared lib
>
>Modified:
>   trunk/buildroot/package/readline/readline.mk
>
>
>Changeset:
>Modified: trunk/buildroot/package/readline/readline.mk
>===================================================================
>--- trunk/buildroot/package/readline/readline.mk	2007-09-23 09:52:03 UTC (rev 19955)
>+++ trunk/buildroot/package/readline/readline.mk	2007-09-23 09:53:12 UTC (rev 19956)
>@@ -42,6 +42,7 @@
> 		--sysconfdir=/etc \
> 		--datadir=/usr/share \
> 		--localstatedir=/var \
>+		--with-shared \

The commonly used term is --enable-shared

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2007-09-23  9:53 ulf at uclibc.org
  2007-09-23 11:14 ` Bernhard Fischer
  0 siblings, 1 reply; 15+ messages in thread
From: ulf at uclibc.org @ 2007-09-23  9:53 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-09-23 02:53:12 -0700 (Sun, 23 Sep 2007)
New Revision: 19956

Log:
Build readline as shared lib

Modified:
   trunk/buildroot/package/readline/readline.mk


Changeset:
Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2007-09-23 09:52:03 UTC (rev 19955)
+++ trunk/buildroot/package/readline/readline.mk	2007-09-23 09:53:12 UTC (rev 19956)
@@ -42,6 +42,7 @@
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
+		--with-shared \
 		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2007-07-16 11:14 ulf at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: ulf at uclibc.org @ 2007-07-16 11:14 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-07-16 04:14:44 -0700 (Mon, 16 Jul 2007)
New Revision: 19111

Log:
Avoid rebuilding 'readline-5.1'

Modified:
   trunk/buildroot/package/readline/readline.mk


Changeset:
Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2007-07-16 10:58:58 UTC (rev 19110)
+++ trunk/buildroot/package/readline/readline.mk	2007-07-16 11:14:44 UTC (rev 19111)
@@ -9,7 +9,9 @@
 READLINE_DIR:=$(BUILD_DIR)/readline-$(READLINE_VERSION)
 READLINE_CAT:=$(ZCAT)
 READLINE_BINARY:=libhistory.a
+READLINE_SHARED_BINARY:=libhistory.so
 READLINE_TARGET_BINARY:=lib/$(READLINE_BINARY)
+READLINE_TARGET_SHARED_BINARY:=lib/$(READLINE_SHARED_BINARY)
 
 $(DL_DIR)/$(READLINE_SOURCE):
 	$(WGET) -P $(DL_DIR) $(READLINE_SITE)/$(READLINE_SOURCE)
@@ -48,6 +50,7 @@
 
 $(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured
 	$(MAKE) -C $(READLINE_DIR)
+	ls $(READLINE_DIR)/$(READLINE_BINARY)
 	touch -c $@
 
 $(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/.configured
@@ -61,7 +64,7 @@
 	touch -c $@
 
 # Install to Target directory
-$(TARGET_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/$(READLINE_BINARY)
+$(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) \
@@ -77,7 +80,7 @@
 readline-dirclean:
 	rm -rf $(READLINE_DIR)
 
-readline-target: $(TARGET_DIR)/$(READLINE_TARGET_BINARY)
+readline-target: $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)
 
 readline-target-clean:
 	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2007-04-06 16:32 aldot at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: aldot at uclibc.org @ 2007-04-06 16:32 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-04-06 09:32:05 -0700 (Fri, 06 Apr 2007)
New Revision: 18352

Log:
- commentary typo fix


Modified:
   trunk/buildroot/package/readline/readline.mk


Changeset:
Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2007-04-06 15:05:05 UTC (rev 18351)
+++ trunk/buildroot/package/readline/readline.mk	2007-04-06 16:32:05 UTC (rev 18352)
@@ -63,7 +63,7 @@
 
 # Install to Target directory
 $(TARGET_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/$(READLINE_BINARY)
-	# make sure we don't end up with lib{readline,hostory}...old
+	# make sure we don't end up with lib{readline,history}...old
 	$(MAKE1) DESTDIR=$(TARGET_DIR) includedir=/usr/include \
 		-C $(READLINE_DIR) uninstall
 	BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2007-03-21  8:04 aldot at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: aldot at uclibc.org @ 2007-03-21  8:04 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-03-21 01:04:19 -0700 (Wed, 21 Mar 2007)
New Revision: 18190

Log:
- install target headers into the correct dir
- make sure not to create libwhatever...old cruft


Modified:
   trunk/buildroot/package/readline/readline.mk


Changeset:
Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2007-03-21 04:13:14 UTC (rev 18189)
+++ trunk/buildroot/package/readline/readline.mk	2007-03-21 08:04:19 UTC (rev 18190)
@@ -20,7 +20,7 @@
 	mkdir -p $(READLINE_DIR)
 	tar -C $(BUILD_DIR) -zxf $(DL_DIR)/$(READLINE_SOURCE)
 	$(CONFIG_UPDATE) $(READLINE_DIR)
-	touch $(READLINE_DIR)/.unpacked
+	touch $@
 
 $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked
 	(cd $(READLINE_DIR); rm -rf config.cache; \
@@ -45,29 +45,30 @@
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 	);
-	touch $(READLINE_DIR)/.configured
+	touch $@
 
 $(READLINE_DIR)/$(READLINE_BINARY): $(READLINE_DIR)/.configured
 	$(MAKE)  -C $(READLINE_DIR)
-	touch -c $(READLINE_DIR)/$(READLINE_BINARY)
+	touch -c $@
 
 $(STAGING_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/.configured
 	$(MAKE) -C $(READLINE_DIR)  install
-	touch -c $(STAGING_DIR)/$(READLINE_TARGET_BINARY)
+	touch -c $@
 
 # Install to Staging area
 $(STAGING_DIR)/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 $(STAGING_DIR)/include/readline/readline.h
+	$(MAKE1) DESTDIR=$(STAGING_DIR) -C $(READLINE_DIR) install
+	touch -c $@
 
-
 # Install to Target directory
-$(TARGET_DIR)/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY)
+$(TARGET_DIR)/$(READLINE_TARGET_BINARY): $(READLINE_DIR)/$(READLINE_BINARY)
+	# make sure we don't end up with lib{readline,hostory}...old
+	$(MAKE1) DESTDIR=$(TARGET_DIR) includedir=/usr/include \
+		-C $(READLINE_DIR) uninstall
 	BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \
-	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) install-shared \
-		uninstall-doc
-	touch -c $(TARGET_DIR)/include/readline/readline.h
+	$(MAKE1) DESTDIR=$(TARGET_DIR) includedir=/usr/include \
+		-C $(READLINE_DIR) install-shared uninstall-doc
 
 readline: $(STAGING_DIR)/include/readline/readline.h
 
@@ -78,10 +79,11 @@
 readline-dirclean:
 	rm -rf $(READLINE_DIR)
 
-readline-target: $(TARGET_DIR)/include/readline/readline.h
+readline-target: $(TARGET_DIR)/$(READLINE_TARGET_BINARY)
 
 readline-target-clean:
-	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall
+	$(MAKE1) DESTDIR=$(TARGET_DIR) includedir=/usr/include \
+		-C $(READLINE_DIR) uninstall
 
 ifeq ($(strip $(BR2_READLINE)),y)
 TARGETS+=readline

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2007-03-20 17:50 aldot at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: aldot at uclibc.org @ 2007-03-20 17:50 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-03-20 10:50:23 -0700 (Tue, 20 Mar 2007)
New Revision: 18183

Log:
- provide means to install readline into the target. Closes #968


Modified:
   trunk/buildroot/package/readline/Config.in
   trunk/buildroot/package/readline/readline.mk


Changeset:
Modified: trunk/buildroot/package/readline/Config.in
===================================================================
--- trunk/buildroot/package/readline/Config.in	2007-03-20 17:21:35 UTC (rev 18182)
+++ trunk/buildroot/package/readline/Config.in	2007-03-20 17:50:23 UTC (rev 18183)
@@ -5,3 +5,9 @@
 	help
 	    Enable GNU readline support?
 
+config BR2_PACKAGE_READLINE_TARGET
+	bool "readline for the target"
+	depends on BR2_READLINE
+	help
+	  Say yes here to install the readline libraries and headers
+	  on the target.

Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2007-03-20 17:21:35 UTC (rev 18182)
+++ trunk/buildroot/package/readline/readline.mk	2007-03-20 17:50:23 UTC (rev 18183)
@@ -14,6 +14,8 @@
 $(DL_DIR)/$(READLINE_SOURCE):
 	$(WGET) -P $(DL_DIR) $(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)
@@ -22,6 +24,7 @@
 
 $(READLINE_DIR)/.configured: $(READLINE_DIR)/.unpacked
 	(cd $(READLINE_DIR); rm -rf config.cache; \
+		bash_cv_func_sigsetjmp=yes \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
@@ -59,16 +62,15 @@
 	touch -c $(STAGING_DIR)/include/readline/readline.h
 
 
-# Install only run-time to Target directory
+# Install to Target directory
 $(TARGET_DIR)/include/readline/readline.h: $(READLINE_DIR)/$(READLINE_BINARY)
 	BUILD_CC=$(TARGET_CC) HOSTCC="$(HOSTCC)" CC=$(TARGET_CC) \
-	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) install-shared
+	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) install-shared \
+		uninstall-doc
 	touch -c $(TARGET_DIR)/include/readline/readline.h
 
 readline: $(STAGING_DIR)/include/readline/readline.h
 
-readline-target: $(TARGET_DIR)/include/readline/readline.h
-
 readline-clean:
 	$(MAKE) -C $(READLINE_DIR) uninstall
 	-$(MAKE) -C $(READLINE_DIR) clean
@@ -76,8 +78,11 @@
 readline-dirclean:
 	rm -rf $(READLINE_DIR)
 
-readline-source:  $(DL_DIR)/$(READLINE_SOURCE)
+readline-target: $(TARGET_DIR)/include/readline/readline.h
 
+readline-target-clean:
+	$(MAKE1) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall
+
 ifeq ($(strip $(BR2_READLINE)),y)
 TARGETS+=readline
 endif

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2007-01-28 13:34 aldot at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: aldot at uclibc.org @ 2007-01-28 13:34 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-01-28 05:34:02 -0800 (Sun, 28 Jan 2007)
New Revision: 17596

Log:
- correct improper prerequisite of -source target


Modified:
   trunk/buildroot/package/readline/readline.mk


Changeset:
Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2007-01-28 13:16:58 UTC (rev 17595)
+++ trunk/buildroot/package/readline/readline.mk	2007-01-28 13:34:02 UTC (rev 17596)
@@ -75,7 +75,7 @@
 readline-dirclean:
 	rm -rf $(READLINE_DIR)
 
-readline-source:  $(DL_DIR)/$(READLINE_SOURCE)   $(READLINE_DIR)/.unpacked
+readline-source:  $(DL_DIR)/$(READLINE_SOURCE)
 
 ifeq ($(strip $(BR2_READLINE)),y)
 TARGETS+=readline

^ permalink raw reply	[flat|nested] 15+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/readline
@ 2006-09-26 15:56 jacmet at uclibc.org
  0 siblings, 0 replies; 15+ messages in thread
From: jacmet at uclibc.org @ 2006-09-26 15:56 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2006-09-26 08:56:03 -0700 (Tue, 26 Sep 2006)
New Revision: 16226

Log:
The target is readline-target, not readline_target

Modified:
   trunk/buildroot/package/readline/readline.mk


Changeset:
Modified: trunk/buildroot/package/readline/readline.mk
===================================================================
--- trunk/buildroot/package/readline/readline.mk	2006-09-26 12:48:43 UTC (rev 16225)
+++ trunk/buildroot/package/readline/readline.mk	2006-09-26 15:56:03 UTC (rev 16226)
@@ -86,5 +86,5 @@
 TARGETS+=readline
 endif
 ifeq ($(strip $(BR2_PACKAGE_READLINE_TARGET)),y)
-TARGETS+=readline_target
+TARGETS+=readline-target
 endif

^ permalink raw reply	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2009-01-30  9:50 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-10-13 23:11 [Buildroot] svn commit: trunk/buildroot/package/readline ulf at uclibc.org
  -- strict thread matches above, loose matches on Subject: below --
2009-01-30  9:50 jacmet at uclibc.org
2008-03-31 14:32 jacmet at uclibc.org
2008-03-06 18:22 ninevoltz at uclibc.org
2008-03-06 23:59 ` Hamish Moffatt
2008-02-06  1:26 hamish at uclibc.org
2008-02-06  1:26 hamish at uclibc.org
2007-09-23  9:53 ulf at uclibc.org
2007-09-23 11:14 ` Bernhard Fischer
2007-07-16 11:14 ulf at uclibc.org
2007-04-06 16:32 aldot at uclibc.org
2007-03-21  8:04 aldot at uclibc.org
2007-03-20 17:50 aldot at uclibc.org
2007-01-28 13:34 aldot at uclibc.org
2006-09-26 15:56 jacmet at uclibc.org

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.