diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-07-10 03:42:33 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:54:05 +0100 |
commit | d108b8a88479f8796fe724968e57502e5a67214e (patch) | |
tree | 0e943d5bde1d0b798d41d36ff19e769961c512a5 /meta/recipes-sato/webkit/files | |
parent | 08131d8f8ea17da270d862df6cf680b824182637 (diff) | |
download | poky-d108b8a88479f8796fe724968e57502e5a67214e.tar.gz |
webgit-gtk: fix build with automake 1.12.1
Added a new patch:
webgit-gtk_fix_build_with_automake_1.12.patch
More comments in the patch header.
(From OE-Core rev: f3ea68cdd2559d84d5b2cd95323d186fff14c7b7)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/files')
-rw-r--r-- | meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch b/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch new file mode 100644 index 0000000000..ad7c55f264 --- /dev/null +++ b/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch | |||
@@ -0,0 +1,62 @@ | |||
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 | ./.deps/DerivedSources | ||
8 | make[1]: ./.deps/DerivedSources: Command not found | ||
9 | make[1]: *** [all-local] Error 127 | ||
10 | |||
11 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
12 | 2012/07/10 | ||
13 | |||
14 | Index: webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am | ||
15 | =================================================================== | ||
16 | --- webkit-gtk-1.7.2+svnr101488-r6.orig/GNUmakefile.am | ||
17 | +++ webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am | ||
18 | @@ -255,7 +255,7 @@ MAINTAINERCLEANFILES += \ | ||
19 | # Older automake versions (1.7) place Plo files in a different place so we need | ||
20 | # to create the output directory manually. | ||
21 | all-local: stamp-po | ||
22 | - $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources | ||
23 | + $(MKDIR_P) $(top_builddir)/$(DEPDIR)/DerivedSources | ||
24 | |||
25 | # remove built sources and program directories | ||
26 | clean-local: | ||
27 | Index: webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am | ||
28 | =================================================================== | ||
29 | --- webkit-gtk-1.7.2+svnr101488-r6.orig/Source/WebKit/gtk/po/GNUmakefile.am | ||
30 | +++ webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am | ||
31 | @@ -132,13 +132,13 @@ DISTCLEANFILES += \ | ||
32 | $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot | ||
33 | |||
34 | po-install-data-local: all | ||
35 | - $(mkdir_p) $(DESTDIR)$(datadir) | ||
36 | + $(MKDIR_P) $(DESTDIR)$(datadir) | ||
37 | @catalogs='$(MOFILES)'; \ | ||
38 | for cat in $$catalogs; do \ | ||
39 | cat=`basename $$cat`; \ | ||
40 | lang=`echo $$cat | sed -e 's/\.mo$$//'`; \ | ||
41 | dir=$(localedir)/$$lang/LC_MESSAGES; \ | ||
42 | - $(mkdir_p) $(DESTDIR)$$dir; \ | ||
43 | + $(MKDIR_P) $(DESTDIR)$$dir; \ | ||
44 | if test -r Source/WebKit/gtk/po/$$cat; then realcat=Source/WebKit/gtk/po/$$cat; else realcat=$(srcdir)/$$cat; fi; \ | ||
45 | $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ | ||
46 | echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ | ||
47 | @@ -173,13 +173,13 @@ po-install-data-local: all | ||
48 | done | ||
49 | |||
50 | po-installdirs-data-local: | ||
51 | - $(mkdir_p) $(DESTDIR)$(datadir) | ||
52 | + $(MKDIR_P) $(DESTDIR)$(datadir) | ||
53 | @catalogs='$(MOFILES)'; \ | ||
54 | for cat in $$catalogs; do \ | ||
55 | cat=`basename $$cat`; \ | ||
56 | lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ | ||
57 | dir=$(localedir)/$$lang/LC_MESSAGES; \ | ||
58 | - $(mkdir_p) $(DESTDIR)$$dir; \ | ||
59 | + $(MKDIR_P) $(DESTDIR)$$dir; \ | ||
60 | for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ | ||
61 | if test -n "$$lc"; then \ | ||
62 | if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ | ||