From: Victor Martinez Date: Mon, 29 Sep 2014 15:06:32 +0000 (+0000) Subject: readline: updated to 6.3.6 X-Git-Url: http://gitweb/?a=commitdiff_plain;h=a3da6e34c0f40ab1171d9331bbb920dffa8e8e10;p=crossrootfs.git readline: updated to 6.3.6 --- diff --git a/readline/.footprint b/readline/.footprint index 2b07fbd..ff3f015 100644 --- a/readline/.footprint +++ b/readline/.footprint @@ -1,10 +1,10 @@ drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/inputrc drwxr-xr-x root/root lib/ -lrwxrwxrwx root/root lib/libhistory.so.6 -> libhistory.so.6.2 --r-xr-xr-x root/root lib/libhistory.so.6.2 -lrwxrwxrwx root/root lib/libreadline.so.6 -> libreadline.so.6.2 --r-xr-xr-x root/root lib/libreadline.so.6.2 +lrwxrwxrwx root/root lib/libhistory.so.6 -> libhistory.so.6.3 +-r-xr-xr-x root/root lib/libhistory.so.6.3 +lrwxrwxrwx root/root lib/libreadline.so.6 -> libreadline.so.6.3 +-r-xr-xr-x root/root lib/libreadline.so.6.3 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/include/ @@ -19,19 +19,27 @@ drwxr-xr-x root/root usr/include/readline/ -rw-r--r-- root/root usr/include/readline/tilde.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libhistory.a -lrwxrwxrwx root/root usr/lib/libhistory.so -> ../../lib/libhistory.so.6.2 +lrwxrwxrwx root/root usr/lib/libhistory.so -> ../../lib/libhistory.so.6.3 -rw-r--r-- root/root usr/lib/libreadline.a -lrwxrwxrwx root/root usr/lib/libreadline.so -> ../../lib/libreadline.so.6.2 +lrwxrwxrwx root/root usr/lib/libreadline.so -> ../../lib/libreadline.so.6.3 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/history.3.gz -rw-r--r-- root/root usr/man/man3/readline.3.gz drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/doc/ +drwxr-xr-x root/root usr/share/doc/readline/ +-rw-r--r-- root/root usr/share/doc/readline/CHANGES +-rw-r--r-- root/root usr/share/doc/readline/INSTALL +-rw-r--r-- root/root usr/share/doc/readline/README drwxr-xr-x root/root usr/share/readline/ -rw-r--r-- root/root usr/share/readline/excallback.c -rw-r--r-- root/root usr/share/readline/fileman.c +-rw-r--r-- root/root usr/share/readline/hist_erasedups.c +-rw-r--r-- root/root usr/share/readline/hist_purgecmd.c -rw-r--r-- root/root usr/share/readline/histexamp.c -rw-r--r-- root/root usr/share/readline/manexamp.c +-rw-r--r-- root/root usr/share/readline/rl-callbacktest.c -rw-r--r-- root/root usr/share/readline/rl-fgets.c -rw-r--r-- root/root usr/share/readline/rl.c -rw-r--r-- root/root usr/share/readline/rlcat.c diff --git a/readline/.md5sum b/readline/.md5sum index de57e79..0733426 100644 --- a/readline/.md5sum +++ b/readline/.md5sum @@ -1,3 +1,4 @@ 553cf04fdeec54dca12062864c3ffba3 inputrc -9ff8505cf10d93f723f35d3bcbbc3dbb readline-6.2.4.patch.gz -67948acb2ca081f23359d0256e9a271c readline-6.2.tar.gz +b1efd651024094fa2f0f3a34d2d0f0b7 readline-6.3.6-wcwidth.patch +44b8c334f34790e920a807a126996882 readline-6.3.6.patch.gz +33c8fb279e981274f485fd91da77e94a readline-6.3.tar.gz diff --git a/readline/Pkgfile b/readline/Pkgfile index fe1e308..e5e0e00 100644 --- a/readline/Pkgfile +++ b/readline/Pkgfile @@ -5,10 +5,10 @@ # Depends on: ncurses name=readline -version=6.2.4 +version=6.3.6 release=1 source=(http://ftp.gnu.org/gnu/$name/$name-${version::3}.tar.gz \ - $name-$version.patch.gz inputrc) + $name-$version.patch.gz inputrc $name-$version-wcwidth.patch) build() { cd $name-${version::3} @@ -18,6 +18,9 @@ build() { # Don't use rpath for linking the shared libs sed -i '117s/-Wl,-rpath,$(libdir)//' support/shobj-conf + # Patch to avoid wcwidth tests + patch -i $SRC/$name-$version-wcwidth.patch + ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ diff --git a/readline/readline-6.2.4.patch.gz b/readline/readline-6.2.4.patch.gz deleted file mode 100644 index a4c31cc..0000000 Binary files a/readline/readline-6.2.4.patch.gz and /dev/null differ diff --git a/readline/readline-6.3.6-wcwidth.patch b/readline/readline-6.3.6-wcwidth.patch new file mode 100644 index 0000000..6570b33 --- /dev/null +++ b/readline/readline-6.3.6-wcwidth.patch @@ -0,0 +1,97 @@ +diff -ur original/readline-6.3/configure build/readline-6.3/configure +--- original/readline-6.3/configure 2013-03-13 23:14:53.000000000 +0900 ++++ build/readline-6.3/configure 2014-04-28 22:52:45.510169436 +0900 +@@ -6316,49 +6316,49 @@ + + fi + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcwidth broken with unicode combining characters" >&5 +-$as_echo_n "checking for wcwidth broken with unicode combining characters... " >&6; } +-if ${bash_cv_wcwidth_broken+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#include +-#include +-#include +- +-#include +-#include +- +-main(c, v) +-int c; +-char **v; +-{ +- int w; +- +- setlocale(LC_ALL, "en_US.UTF-8"); +- w = wcwidth (0x0301); +- exit (w == 0); /* exit 0 if wcwidth broken */ +-} +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- bash_cv_wcwidth_broken=yes +-else +- bash_cv_wcwdith_broken=no +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +-fi ++#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcwidth broken with unicode combining characters" >&5 ++#$as_echo_n "checking for wcwidth broken with unicode combining characters... " >&6; } ++#if ${bash_cv_wcwidth_broken+:} false; then : ++# $as_echo_n "(cached) " >&6 ++#else ++# if test "$cross_compiling" = yes; then : ++# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++#as_fn_error $? "cannot run test program while cross compiling ++#See \`config.log' for more details" "$LINENO" 5; } ++#else ++# cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++#/* end confdefs.h. */ ++# ++##include ++##include ++##include ++# ++##include ++##include ++# ++#main(c, v) ++#int c; ++#char **v; ++#{ ++# int w; ++# ++# setlocale(LC_ALL, "en_US.UTF-8"); ++# w = wcwidth (0x0301); ++# exit (w == 0); /* exit 0 if wcwidth broken */ ++#} ++# ++#_ACEOF ++#if ac_fn_c_try_run "$LINENO"; then : ++# bash_cv_wcwidth_broken=yes ++#else ++# bash_cv_wcwdith_broken=no ++#fi ++#rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++# conftest.$ac_objext conftest.beam conftest.$ac_ext ++#fi ++bash_cv_wcwdith_broken=no ++#fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bash_cv_wcwidth_broken" >&5 + $as_echo "$bash_cv_wcwidth_broken" >&6; } + if test "$bash_cv_wcwidth_broken" = yes; then + diff --git a/readline/readline-6.3.6.patch.gz b/readline/readline-6.3.6.patch.gz new file mode 100644 index 0000000..bbbf639 Binary files /dev/null and b/readline/readline-6.3.6.patch.gz differ