From addb823a797b7e8e02be44ae9d2a4802dcb46c92 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 4 Nov 2014 11:39:04 +0000 Subject: libunistring: 0.9.3 -> 0.9.4 Drop two patches merged upstream. Signed-off-by: Richard Purdie --- ...conv-m4-remove-the-test-to-convert-euc-jp.patch | 20 +++--- .../libunistring_fix_for_automake_1.12.patch | 81 ---------------------- .../libunistring/libunistring/parallelmake.patch | 26 ------- 3 files changed, 9 insertions(+), 118 deletions(-) delete mode 100644 meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch delete mode 100644 meta/recipes-support/libunistring/libunistring/parallelmake.patch (limited to 'meta/recipes-support/libunistring/libunistring') 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 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], diff --git a/meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch b/meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch deleted file mode 100644 index 5d831d5491..0000000000 --- a/meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch +++ /dev/null @@ -1,81 +0,0 @@ -Upstream-Status: Pending - -automake 1.12 has deprecated use of mkdir_p, and it recommends -use of MKDIR_P instead. Changed the code to avoid these kind -of warning-errors. - -| make[2]: /build/tmp/work/x86_64-linux/libunistring-native-0.9.3-r2/image/srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/share/doc/libunistring: Command not found -| make[2]: *** [install-html-split] Error 127 - -Signed-Off-By: Nitin A Kamble -2012/07/10 - -Index: libunistring-0.9.3/doc/Makefile.am -=================================================================== ---- libunistring-0.9.3.orig/doc/Makefile.am -+++ libunistring-0.9.3/doc/Makefile.am -@@ -87,7 +87,7 @@ TEXI2DVI = @TEXI2DVI@ $(TEXINCLUDES) - # The install-dvi target is already defined by automake. - - installdirs-dvi: -- $(mkdir_p) $(DESTDIR)$(dvidir) -+ $(MKDIR_P) $(DESTDIR)$(dvidir) - - uninstall-dvi: - $(RM) $(DESTDIR)$(dvidir)/libunistring.dvi -@@ -105,7 +105,7 @@ libunistring.ps: libunistring.dvi - # The install-ps target is already defined by automake. - - installdirs-ps: -- $(mkdir_p) $(DESTDIR)$(psdir) -+ $(MKDIR_P) $(DESTDIR)$(psdir) - - uninstall-ps: - $(RM) $(DESTDIR)$(psdir)/libunistring.ps -@@ -120,7 +120,7 @@ TEXI2PDF = @TEXI2DVI@ --pdf $(TEXINCLUDE - # The install-pdf target is already defined by automake. - - installdirs-pdf: -- $(mkdir_p) $(DESTDIR)$(pdfdir) -+ $(MKDIR_P) $(DESTDIR)$(pdfdir) - - uninstall-pdf: - $(RM) $(DESTDIR)$(pdfdir)/libunistring.pdf -@@ -151,17 +151,17 @@ libunistring_toc.html: libunistring.texi - } - - install-html-monolithic: libunistring.html -- $(mkdir_p) $(DESTDIR)$(htmldir) -+ $(MKDIR_P) $(DESTDIR)$(htmldir) - $(INSTALL_DATA) `if test -f libunistring.html; then echo .; else echo $(srcdir); fi`/libunistring.html $(DESTDIR)$(htmldir)/libunistring.html - - install-html-split: libunistring_toc.html -- $(mkdir_p) $(DESTDIR)$(htmldir) -+ $(MKDIR_P) $(DESTDIR)$(htmldir) - for file in `if test -f libunistring_toc.html; then echo .; else echo $(srcdir); fi`/libunistring_*.html; do \ - $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir)/`basename $$file`; \ - done - - installdirs-html: -- $(mkdir_p) $(DESTDIR)$(htmldir) -+ $(MKDIR_P) $(DESTDIR)$(htmldir) - - uninstall-html-monolithic: - $(RM) $(DESTDIR)$(htmldir)/libunistring.html -@@ -170,14 +170,14 @@ uninstall-html-split: - $(RM) $(DESTDIR)$(htmldir)/libunistring_*.html - - dist-html-monolithic: -- $(mkdir_p) $(distdir)/ -+ $(MKDIR_P) $(distdir)/ - file=libunistring.html; \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - cp -p $$d/$$file $(distdir)/$$file || exit 1 - - # We would like to put libunistring_*.html into EXTRA_DIST, but it doesn't work. - dist-html-split: libunistring_toc.html -- $(mkdir_p) $(distdir)/ -+ $(MKDIR_P) $(distdir)/ - file=libunistring_toc.html; \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - for file in `cd $$d && echo libunistring_*.html`; do \ diff --git a/meta/recipes-support/libunistring/libunistring/parallelmake.patch b/meta/recipes-support/libunistring/libunistring/parallelmake.patch deleted file mode 100644 index 21025b8e9d..0000000000 --- a/meta/recipes-support/libunistring/libunistring/parallelmake.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix a parallel make race where cdefs.h uses the unused-parameter.h header file -but has no dependency listed. This can result in an empty cdefs.h file which -results in a build failure like: - -| In file included from striconveh.c:30:0: -| unistr.h:193:48: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER' -| In file included from striconveh.c:30:0: -| unistr.h:263:54: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER' - -Upstream-Status: Pending - -RP 2012/4/12 - -Index: libunistring-0.9.3/lib/Makefile.am -=================================================================== ---- libunistring-0.9.3.orig/lib/Makefile.am 2012-04-12 07:45:41.450059820 +0000 -+++ libunistring-0.9.3/lib/Makefile.am 2012-04-12 07:48:45.434055559 +0000 -@@ -157,7 +157,7 @@ - - # unistring/cdefs.h is not public, but is included by other header files. - nobase_nodist_include_HEADERS += unistring/cdefs.h --unistring/cdefs.h : unistring/cdefs.in.h -+unistring/cdefs.h : unistring/cdefs.in.h $(UNUSED_PARAMETER_H) - @MKDIR_P@ unistring - rm -f $@-t $@ - sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \ -- cgit 1.2.3-korg