diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-04 11:39:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-05 23:33:25 +0000 |
commit | addb823a797b7e8e02be44ae9d2a4802dcb46c92 (patch) | |
tree | 4efa3a2d366f75bc8bca183c360bc49371c770c2 /meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch | |
parent | 42aa9cf193ae14cccb102c55a51cbc533300ad71 (diff) | |
download | openembedded-core-addb823a797b7e8e02be44ae9d2a4802dcb46c92.tar.gz |
libunistring: 0.9.3 -> 0.9.4
Drop two patches merged upstream.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch')
-rw-r--r-- | meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch b/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch index a330c73412..d4489165bf 100644 --- a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch +++ b/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch @@ -16,11 +16,11 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> gnulib-m4/iconv.m4 | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) -diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 -index f46ff14..de0a5e9 100644 ---- a/gnulib-m4/iconv.m4 -+++ b/gnulib-m4/iconv.m4 -@@ -126,17 +126,6 @@ int main () +Index: libunistring-0.9.4/gnulib-m4/iconv.m4 +=================================================================== +--- libunistring-0.9.4.orig/gnulib-m4/iconv.m4 2014-11-03 17:41:29.755011917 +0000 ++++ libunistring-0.9.4/gnulib-m4/iconv.m4 2014-11-03 17:43:03.795014480 +0000 +@@ -159,17 +159,6 @@ } } #endif @@ -34,9 +34,7 @@ index f46ff14..de0a5e9 100644 - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) -- return 1; - return 0; - }], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], - [case "$host_os" in --- -1.7.4 +- result |= 16; + return result; + }]])], + [am_cv_func_iconv_works=yes], |