From: Nitin A Kamble <[email protected]> Added a new patch: webgit-gtk_fix_build_with_automake_1.12.patch
More comments in the patch header. Signed-off-by: Nitin A Kamble <[email protected]> --- .../webgit-gtk_fix_build_with_automake_1.12.patch | 62 ++++++++++++++++++++ meta/recipes-sato/webkit/webkit-gtk_svn.bb | 3 +- 2 files changed, 64 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch 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 0000000..ad7c55f --- /dev/null +++ b/meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch @@ -0,0 +1,62 @@ +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. + +./.deps/DerivedSources +make[1]: ./.deps/DerivedSources: Command not found +make[1]: *** [all-local] Error 127 + +Signed-Off-By: Nitin A Kamble <[email protected]> +2012/07/10 + +Index: webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am +=================================================================== +--- webkit-gtk-1.7.2+svnr101488-r6.orig/GNUmakefile.am ++++ webkit-gtk-1.7.2+svnr101488-r6/GNUmakefile.am +@@ -255,7 +255,7 @@ MAINTAINERCLEANFILES += \ + # Older automake versions (1.7) place Plo files in a different place so we need + # to create the output directory manually. + all-local: stamp-po +- $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources ++ $(MKDIR_P) $(top_builddir)/$(DEPDIR)/DerivedSources + + # remove built sources and program directories + clean-local: +Index: webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am +=================================================================== +--- webkit-gtk-1.7.2+svnr101488-r6.orig/Source/WebKit/gtk/po/GNUmakefile.am ++++ webkit-gtk-1.7.2+svnr101488-r6/Source/WebKit/gtk/po/GNUmakefile.am +@@ -132,13 +132,13 @@ DISTCLEANFILES += \ + $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot + + po-install-data-local: all +- $(mkdir_p) $(DESTDIR)$(datadir) ++ $(MKDIR_P) $(DESTDIR)$(datadir) + @catalogs='$(MOFILES)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkdir_p) $(DESTDIR)$$dir; \ ++ $(MKDIR_P) $(DESTDIR)$$dir; \ + if test -r Source/WebKit/gtk/po/$$cat; then realcat=Source/WebKit/gtk/po/$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ +@@ -173,13 +173,13 @@ po-install-data-local: all + done + + po-installdirs-data-local: +- $(mkdir_p) $(DESTDIR)$(datadir) ++ $(MKDIR_P) $(DESTDIR)$(datadir) + @catalogs='$(MOFILES)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkdir_p) $(DESTDIR)$$dir; \ ++ $(MKDIR_P) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb index 716afce..1146ce1 100644 --- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb +++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb @@ -19,7 +19,7 @@ SRCREV_FORMAT = "source" SRCREV = "101488" PV = "1.7.2+svnr${SRCPV}" -PR = "r5" +PR = "r6" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \ @@ -33,6 +33,7 @@ SRC_URI = "\ file://gtk-doc.make \ file://nodolt.patch \ file://function-scope.patch \ + file://webgit-gtk_fix_build_with_automake_1.12.patch \ " S = "${WORKDIR}/" -- 1.7.3.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
