Revision: 8008
http://sourceforge.net/p/astlinux/code/8008
Author: abelbeck
Date: 2016-12-02 19:09:43 +0000 (Fri, 02 Dec 2016)
Log Message:
-----------
readline, version bump to 7.0
Modified Paths:
--------------
branches/1.0/package/readline/Config.in
branches/1.0/package/readline/readline.mk
Added Paths:
-----------
branches/1.0/package/readline/readline-0000-curses-link.patch
Removed Paths:
-------------
branches/1.0/package/readline/readline-6.2-curses-link.patch
branches/1.0/package/readline/readline-6.2-pl1.patch
Modified: branches/1.0/package/readline/Config.in
===================================================================
--- branches/1.0/package/readline/Config.in 2016-12-02 16:09:27 UTC (rev 8007)
+++ branches/1.0/package/readline/Config.in 2016-12-02 19:09:43 UTC (rev 8008)
@@ -2,4 +2,9 @@
bool "readline"
select BR2_PACKAGE_NCURSES
help
- Enable GNU readline support?
+ The GNU Readline library provides a set of functions for use
+ by applications that allow users to edit command lines
+ as they are typed in.
+
+ https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+
Added: branches/1.0/package/readline/readline-0000-curses-link.patch
===================================================================
--- branches/1.0/package/readline/readline-0000-curses-link.patch (rev 0)
+++ branches/1.0/package/readline/readline-0000-curses-link.patch 2016-12-02 19:09:43 UTC (rev 8008)
@@ -0,0 +1,16 @@
+link readline directly to ncurses since it needs symbols from it
+
+upstream readline does this on purpose (no direct linking), but
+it doesn't make much sense in a Linux world
+
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -42,7 +42,7 @@
+ SHOBJ_LIBS=
+
+ SHLIB_XLDFLAGS=
+-SHLIB_LIBS=
++SHLIB_LIBS=-lncurses
+
+ SHLIB_DOT='.'
+ SHLIB_LIBPREF='lib'
Deleted: branches/1.0/package/readline/readline-6.2-curses-link.patch
===================================================================
--- branches/1.0/package/readline/readline-6.2-curses-link.patch 2016-12-02 16:09:27 UTC (rev 8007)
+++ branches/1.0/package/readline/readline-6.2-curses-link.patch 2016-12-02 19:09:43 UTC (rev 8008)
@@ -1,16 +0,0 @@
-link readline directly to ncurses since it needs symbols from it
-
-upstream readline does this on purpose (no direct linking), but
-it doesn't make much sense in a Linux world
-
---- a/support/shobj-conf
-+++ b/support/shobj-conf
-@@ -42,7 +42,7 @@
- SHOBJ_LIBS=
-
- SHLIB_XLDFLAGS=
--SHLIB_LIBS=
-+SHLIB_LIBS=-lncurses
-
- SHLIB_DOT='.'
- SHLIB_LIBPREF='lib'
Deleted: branches/1.0/package/readline/readline-6.2-pl1.patch
===================================================================
--- branches/1.0/package/readline/readline-6.2-pl1.patch 2016-12-02 16:09:27 UTC (rev 8007)
+++ branches/1.0/package/readline/readline-6.2-pl1.patch 2016-12-02 19:09:43 UTC (rev 8008)
@@ -1,29 +0,0 @@
-Bug-Reported-by: Clark J. Wang <dea...@gm...>
-Bug-Reference-ID: <AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc...@ma...>
-Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
-
-diff -Nura readline-6.2/callback.c readline-6.2-pl1/callback.c
---- readline-6.2/callback.c 2010-06-06 13:18:58.000000000 -0300
-+++ readline-6.2-pl1/callback.c 2011-04-19 14:20:00.269829168 -0300
-@@ -148,6 +148,9 @@
- eof = _rl_vi_domove_callback (_rl_vimvcxt);
- /* Should handle everything, including cleanup, numeric arguments,
- and turning off RL_STATE_VIMOTION */
-+ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
-+ _rl_internal_char_cleanup ();
-+
- return;
- }
- #endif
-diff -Nura readline-6.2/vi_mode.c readline-6.2-pl1/vi_mode.c
---- readline-6.2/vi_mode.c 2010-11-20 21:51:39.000000000 -0300
-+++ readline-6.2-pl1/vi_mode.c 2011-04-19 14:19:24.510586785 -0300
-@@ -1114,7 +1114,7 @@
- rl_beg_of_line (1, c);
- _rl_vi_last_motion = c;
- RL_UNSETSTATE (RL_STATE_VIMOTION);
-- return (0);
-+ return (vidomove_dispatch (m));
- }
- #if defined (READLINE_CALLBACKS)
- /* XXX - these need to handle rl_universal_argument bindings */
Modified: branches/1.0/package/readline/readline.mk
===================================================================
--- branches/1.0/package/readline/readline.mk 2016-12-02 16:09:27 UTC (rev 8007)
+++ branches/1.0/package/readline/readline.mk 2016-12-02 19:09:43 UTC (rev 8008)
@@ -4,24 +4,26 @@
#
#############################################################
-READLINE_VERSION = 6.2
+READLINE_VERSION = 7.0
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
+READLINE_CONF_ENV = \
+ bash_cv_func_sigsetjmp=yes \
+ bash_cv_wcwidth_broken=no
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)
+ cp -a $(STAGING_DIR)/usr/lib/libhistory.so* $(TARGET_DIR)/usr/lib/
+ cp -a $(STAGING_DIR)/usr/lib/libreadline.so* $(TARGET_DIR)/usr/lib/
+ chmod +w $(addprefix $(TARGET_DIR)/usr/lib/,libhistory.so.* libreadline.so.*)
endef
+define READLINE_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libhistory.so*
+ rm -f $(TARGET_DIR)/usr/lib/libreadline.so*
+endef
+
$(eval $(call AUTOTARGETS,package,readline))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
