From 58a7ed97d0bef61b53848c9812be6f93ce16b67e Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 17 May 2016 14:53:43 +0000 Subject: [PATCH] readline: added missing patch --- readline/Pkgfile | 2 +- readline/readline-6.3.6-wcwidth.patch | 97 -------------------------- readline/readline-6.3.8.patch.gz | Bin 0 -> 3339 bytes 3 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 readline/readline-6.3.6-wcwidth.patch create mode 100644 readline/readline-6.3.8.patch.gz diff --git a/readline/Pkgfile b/readline/Pkgfile index d4c9bbc..3202c58 100644 --- a/readline/Pkgfile +++ b/readline/Pkgfile @@ -18,7 +18,7 @@ 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 to avoid wcwidth tests patch -i $SRC/$name-$version-wcwidth.patch ./configure --build=$CHOST \ diff --git a/readline/readline-6.3.6-wcwidth.patch b/readline/readline-6.3.6-wcwidth.patch deleted file mode 100644 index 6570b33..0000000 --- a/readline/readline-6.3.6-wcwidth.patch +++ /dev/null @@ -1,97 +0,0 @@ -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.8.patch.gz b/readline/readline-6.3.8.patch.gz new file mode 100644 index 0000000000000000000000000000000000000000..1c3cd7ab35826baf0e9260e9ff178b0d3b371ea2 GIT binary patch literal 3339 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 Vvx0Ev0YDhA@qcvito-mR001dtY104z literal 0 HcmV?d00001 -- 2.26.2