diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 14:36:22 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 15:32:53 +0200 |
commit | f4cf9fe05bb3f32fabea4e54dd92d368967a80da (patch) | |
tree | 487180fa9866985ea7b28e625651765d86f515c3 /meta/recipes-support/libunistring/libunistring | |
download | poky-f4cf9fe05bb3f32fabea4e54dd92d368967a80da.tar.gz |
initial commit for Enea Linux 4.0
Migrated from the internal git server on the daisy-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-support/libunistring/libunistring')
3 files changed, 149 insertions, 0 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 new file mode 100644 index 0000000000..a330c73412 --- /dev/null +++ b/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 8d99a368615656a835f5502326afd31cec2cebfe Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Mon, 16 Sep 2013 18:16:12 +0800 | ||
4 | Subject: [PATCH] remove the test to convert euc-jp | ||
5 | |||
6 | Remove the test "Test against HP-UX 11.11 bug: | ||
7 | No converter from EUC-JP to UTF-8 is provided" | ||
8 | since we don't support HP-UX and if the euc-jp is not | ||
9 | installed on the host, libunistring will be built without | ||
10 | iconv support and will cause guild-native configure fail. | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE specific] | ||
13 | |||
14 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
15 | --- | ||
16 | gnulib-m4/iconv.m4 | 11 ----------- | ||
17 | 1 files changed, 0 insertions(+), 11 deletions(-) | ||
18 | |||
19 | diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 | ||
20 | index f46ff14..de0a5e9 100644 | ||
21 | --- a/gnulib-m4/iconv.m4 | ||
22 | +++ b/gnulib-m4/iconv.m4 | ||
23 | @@ -126,17 +126,6 @@ int main () | ||
24 | } | ||
25 | } | ||
26 | #endif | ||
27 | - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is | ||
28 | - provided. */ | ||
29 | - if (/* Try standardized names. */ | ||
30 | - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) | ||
31 | - /* Try IRIX, OSF/1 names. */ | ||
32 | - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) | ||
33 | - /* Try AIX names. */ | ||
34 | - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) | ||
35 | - /* Try HP-UX names. */ | ||
36 | - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) | ||
37 | - return 1; | ||
38 | return 0; | ||
39 | }], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], | ||
40 | [case "$host_os" in | ||
41 | -- | ||
42 | 1.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 new file mode 100644 index 0000000000..5d831d5491 --- /dev/null +++ b/meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch | |||
@@ -0,0 +1,81 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | automake 1.12 has deprecated use of mkdir_p, and it recommends | ||
4 | use of MKDIR_P instead. Changed the code to avoid these kind | ||
5 | of 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 | |||
10 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
11 | 2012/07/10 | ||
12 | |||
13 | Index: 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 new file mode 100644 index 0000000000..21025b8e9d --- /dev/null +++ b/meta/recipes-support/libunistring/libunistring/parallelmake.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Fix a parallel make race where cdefs.h uses the unused-parameter.h header file | ||
2 | but has no dependency listed. This can result in an empty cdefs.h file which | ||
3 | results 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 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | RP 2012/4/12 | ||
13 | |||
14 | Index: 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)' \ | ||