summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-04 11:39:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-06 16:45:17 +0000
commitd38da0f14e22a0a10509cc0c3652626731b1427e (patch)
tree62b511d2378268d9fee1c03e67f10002ab725f02 /meta/recipes-support
parentc4c7b0fb236904c0ab625a5c2b49abaa8db6d891 (diff)
downloadpoky-d38da0f14e22a0a10509cc0c3652626731b1427e.tar.gz
libunistring: 0.9.3 -> 0.9.4
Drop two patches merged upstream. (From OE-Core rev: addb823a797b7e8e02be44ae9d2a4802dcb46c92) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch20
-rw-r--r--meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch81
-rw-r--r--meta/recipes-support/libunistring/libunistring/parallelmake.patch26
-rw-r--r--meta/recipes-support/libunistring/libunistring_0.9.4.bb (renamed from meta/recipes-support/libunistring/libunistring_0.9.3.bb)8
4 files changed, 11 insertions, 124 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>
16 gnulib-m4/iconv.m4 | 11 ----------- 16 gnulib-m4/iconv.m4 | 11 -----------
17 1 files changed, 0 insertions(+), 11 deletions(-) 17 1 files changed, 0 insertions(+), 11 deletions(-)
18 18
19diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 19Index: libunistring-0.9.4/gnulib-m4/iconv.m4
20index f46ff14..de0a5e9 100644 20===================================================================
21--- a/gnulib-m4/iconv.m4 21--- libunistring-0.9.4.orig/gnulib-m4/iconv.m4 2014-11-03 17:41:29.755011917 +0000
22+++ b/gnulib-m4/iconv.m4 22+++ libunistring-0.9.4/gnulib-m4/iconv.m4 2014-11-03 17:43:03.795014480 +0000
23@@ -126,17 +126,6 @@ int main () 23@@ -159,17 +159,6 @@
24 } 24 }
25 } 25 }
26 #endif 26 #endif
@@ -34,9 +34,7 @@ index f46ff14..de0a5e9 100644
34- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) 34- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
35- /* Try HP-UX names. */ 35- /* Try HP-UX names. */
36- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) 36- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
37- return 1; 37- result |= 16;
38 return 0; 38 return result;
39 }], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], 39 }]])],
40 [case "$host_os" in 40 [am_cv_func_iconv_works=yes],
41--
421.7.4
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 @@
1Upstream-Status: Pending
2
3automake 1.12 has deprecated use of mkdir_p, and it recommends
4use of MKDIR_P instead. Changed the code to avoid these kind
5of warning-errors.
6
7| 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
8| make[2]: *** [install-html-split] Error 127
9
10Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
112012/07/10
12
13Index: libunistring-0.9.3/doc/Makefile.am
14===================================================================
15--- libunistring-0.9.3.orig/doc/Makefile.am
16+++ libunistring-0.9.3/doc/Makefile.am
17@@ -87,7 +87,7 @@ TEXI2DVI = @TEXI2DVI@ $(TEXINCLUDES)
18 # The install-dvi target is already defined by automake.
19
20 installdirs-dvi:
21- $(mkdir_p) $(DESTDIR)$(dvidir)
22+ $(MKDIR_P) $(DESTDIR)$(dvidir)
23
24 uninstall-dvi:
25 $(RM) $(DESTDIR)$(dvidir)/libunistring.dvi
26@@ -105,7 +105,7 @@ libunistring.ps: libunistring.dvi
27 # The install-ps target is already defined by automake.
28
29 installdirs-ps:
30- $(mkdir_p) $(DESTDIR)$(psdir)
31+ $(MKDIR_P) $(DESTDIR)$(psdir)
32
33 uninstall-ps:
34 $(RM) $(DESTDIR)$(psdir)/libunistring.ps
35@@ -120,7 +120,7 @@ TEXI2PDF = @TEXI2DVI@ --pdf $(TEXINCLUDE
36 # The install-pdf target is already defined by automake.
37
38 installdirs-pdf:
39- $(mkdir_p) $(DESTDIR)$(pdfdir)
40+ $(MKDIR_P) $(DESTDIR)$(pdfdir)
41
42 uninstall-pdf:
43 $(RM) $(DESTDIR)$(pdfdir)/libunistring.pdf
44@@ -151,17 +151,17 @@ libunistring_toc.html: libunistring.texi
45 }
46
47 install-html-monolithic: libunistring.html
48- $(mkdir_p) $(DESTDIR)$(htmldir)
49+ $(MKDIR_P) $(DESTDIR)$(htmldir)
50 $(INSTALL_DATA) `if test -f libunistring.html; then echo .; else echo $(srcdir); fi`/libunistring.html $(DESTDIR)$(htmldir)/libunistring.html
51
52 install-html-split: libunistring_toc.html
53- $(mkdir_p) $(DESTDIR)$(htmldir)
54+ $(MKDIR_P) $(DESTDIR)$(htmldir)
55 for file in `if test -f libunistring_toc.html; then echo .; else echo $(srcdir); fi`/libunistring_*.html; do \
56 $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir)/`basename $$file`; \
57 done
58
59 installdirs-html:
60- $(mkdir_p) $(DESTDIR)$(htmldir)
61+ $(MKDIR_P) $(DESTDIR)$(htmldir)
62
63 uninstall-html-monolithic:
64 $(RM) $(DESTDIR)$(htmldir)/libunistring.html
65@@ -170,14 +170,14 @@ uninstall-html-split:
66 $(RM) $(DESTDIR)$(htmldir)/libunistring_*.html
67
68 dist-html-monolithic:
69- $(mkdir_p) $(distdir)/
70+ $(MKDIR_P) $(distdir)/
71 file=libunistring.html; \
72 if test -f $$file; then d=.; else d=$(srcdir); fi; \
73 cp -p $$d/$$file $(distdir)/$$file || exit 1
74
75 # We would like to put libunistring_*.html into EXTRA_DIST, but it doesn't work.
76 dist-html-split: libunistring_toc.html
77- $(mkdir_p) $(distdir)/
78+ $(MKDIR_P) $(distdir)/
79 file=libunistring_toc.html; \
80 if test -f $$file; then d=.; else d=$(srcdir); fi; \
81 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 @@
1Fix a parallel make race where cdefs.h uses the unused-parameter.h header file
2but has no dependency listed. This can result in an empty cdefs.h file which
3results in a build failure like:
4
5| In file included from striconveh.c:30:0:
6| unistr.h:193:48: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER'
7| In file included from striconveh.c:30:0:
8| unistr.h:263:54: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER'
9
10Upstream-Status: Pending
11
12RP 2012/4/12
13
14Index: libunistring-0.9.3/lib/Makefile.am
15===================================================================
16--- libunistring-0.9.3.orig/lib/Makefile.am 2012-04-12 07:45:41.450059820 +0000
17+++ libunistring-0.9.3/lib/Makefile.am 2012-04-12 07:48:45.434055559 +0000
18@@ -157,7 +157,7 @@
19
20 # unistring/cdefs.h is not public, but is included by other header files.
21 nobase_nodist_include_HEADERS += unistring/cdefs.h
22-unistring/cdefs.h : unistring/cdefs.in.h
23+unistring/cdefs.h : unistring/cdefs.in.h $(UNUSED_PARAMETER_H)
24 @MKDIR_P@ unistring
25 rm -f $@-t $@
26 sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \
diff --git a/meta/recipes-support/libunistring/libunistring_0.9.3.bb b/meta/recipes-support/libunistring/libunistring_0.9.4.bb
index db1651b2a6..89b1dc26f1 100644
--- a/meta/recipes-support/libunistring/libunistring_0.9.3.bb
+++ b/meta/recipes-support/libunistring/libunistring_0.9.4.bb
@@ -18,15 +18,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
18 file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" 18 file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
19 19
20SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ 20SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \
21 file://parallelmake.patch \
22 file://libunistring_fix_for_automake_1.12.patch \
23 file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \ 21 file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \
24" 22"
25 23
26SRC_URI[md5sum] = "db8eca3b64163abadf8c40e5cecc261f" 24SRC_URI[md5sum] = "c24a6a3838d9ad4a41a62549312c4226"
27SRC_URI[sha256sum] = "610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3" 25SRC_URI[sha256sum] = "f5246d63286a42902dc096d6d44541fbe4204b6c02d6d5d28b457c9882ddd8a6"
28
29PR = "r3"
30 26
31inherit autotools texinfo 27inherit autotools texinfo
32BBCLASSEXTEND = "native nativesdk" 28BBCLASSEXTEND = "native nativesdk"