more commits related to automake update
cover more commits related to automake update
From: Nitin A Kamble <[email protected]>
With the "world" build, found out that more recipes are failing due to automake 1.12.x All these remainling recipes are fixed and the world build succeeds with automake 1.12.1 now.
Thanks,
Nitin
The following changes since commit 45d7793f0e3092f3ba4e03c52195ea13179ad1d8:
pango: fix dependencies to avoid build issue (2012-07-09 09:22:00 -0700)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/automake_update
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/automake_update
Nitin A Kamble (4):
libunistring: fix build with automake 1.12
telepathy-python: fix build with automake 1.12
libidn: fix build with automake 1.12
webgit-gtk: fix build with automake 1.12.1
.../telepathy-python_fix_for_automake_1.12.patch | 26 ++++++ .../telepathy/telepathy-python_0.15.19.bb | 5 +- ..._MKDIR_P_warning_error_with_automake_1.12.patch | 25 ++++++ meta/recipes-extended/libidn/libidn_1.24.bb | 5 +- .../webgit-gtk_fix_build_with_automake_1.12.patch | 62 +++++++++++++++ meta/recipes-sato/webkit/webkit-gtk_svn.bb | 3 +- .../libunistring_fix_for_automake_1.12.patch | 81 ++++++++++++++++++++ .../libunistring/libunistring_0.9.3.bb | 5 +- 8 files changed, 205 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch create mode 100644 meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch create mode 100644 meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch create mode 100644 meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch
Signature · 1 line
1.7.3.4
PATCH 1/4 libunistring: fix build with automake 1.12
From: Nitin A Kamble <[email protected]>
Added a new patch:
libunistring/libunistring_fix_for_automake_1.12.patch
More comments in the patch header.
Signed-off-by Nitin A Kamble <[email protected]>
--- .../libunistring_fix_for_automake_1.12.patch | 81 ++++++++++++++++++++ .../libunistring/libunistring_0.9.3.bb | 5 +- 2 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch
meta/recipes-support/libunistring/libunistring/libunistring_fix_for_automake_1.12.patch new file +81 -0
@@ -0,0 +1,81 @@ +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 <[email protected]> +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 \
meta/recipes-support/libunistring/libunistring_0.9.3.bb +3 -2
@@ -18,12 +18,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ - file://parallelmake.patch" + file://parallelmake.patch \ + file://libunistring_fix_for_automake_1.12.patch" SRC_URI[md5sum] = "db8eca3b64163abadf8c40e5cecc261f" SRC_URI[sha256sum] = "610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3" -PR = "r2" +PR = "r3" inherit autotools BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.7.3.4
PATCH 2/4 telepathy-python: fix build with automake 1.12
From: Nitin A Kamble <[email protected]>
Added a new patch:
telepathy-python_fix_for_automake_1.12.patch
More comments in the patch header.
Signed-off-by Nitin A Kamble <[email protected]>
--- .../telepathy-python_fix_for_automake_1.12.patch | 26 ++++++++++++++++++++ .../telepathy/telepathy-python_0.15.19.bb | 5 ++- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch new file +26 -0
@@ -0,0 +1,26 @@ +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[1]: _generated/: Command not found +| make[1]: *** [_generated/__init__.py] Error 127 +| make[1]: Leaving directory `/srv/home/nitin/builds2/build0/tmp/work/i586-poky-linux/telepathy-python-0.15.19-r4/telepathy-python-0.15.19/src' +| make: *** [all-recursive] Error 1 + +Signed-Off-By: Nitin A Kamble <[email protected]> +2012/07/10 +Index: telepathy-python-0.15.19/src/Makefile.am +=================================================================== +--- telepathy-python-0.15.19.orig/src/Makefile.am ++++ telepathy-python-0.15.19/src/Makefile.am +@@ -55,7 +55,7 @@ _generated/errors.py: _generated/__init_ + $(spec_dir)/all.xml + + _generated/__init__.py: +- $(AM_V_GEN)$(mkdir_p) $(dir $@) ++ $(AM_V_GEN)$(MKDIR_P) $(dir $@) + @echo "# Placeholder for package" > $@ + + _generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb +3 -2
@@ -8,9 +8,10 @@ RDEPENDS_${PN} += "python-dbus" SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ file://parallel_make.patch \ - file://remove_duplicate_install.patch" + file://remove_duplicate_install.patch \ + file://telepathy-python_fix_for_automake_1.12.patch" -PR = "r4" +PR = "r5" inherit autotools
Signature · 1 line
1.7.3.4
PATCH 3/4 libidn: fix build with automake 1.12
In reply to [email protected]From: Nitin A Kamble <[email protected]>
Added a new patch
avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
More details in the patch headers.
Signed-off-by Nitin A Kamble <[email protected]>
--- ..._MKDIR_P_warning_error_with_automake_1.12.patch | 25 ++++++++++++++++++++ meta/recipes-extended/libidn/libidn_1.24.bb | 5 ++- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch new file +25 -0
@@ -0,0 +1,25 @@ +Upsteam-Status: Inappropriate + +automake 1.12.x has depricated AM_PROG_MKDIR_P , and throws a warning for that, +and the warnings are treated as errors becuase of the -Werror parameter. + +These AM_PROG_MKDIR_P are coming from gettext, and the latest gettext code has not +eliminated these depricated macros yet. So disable the treatment of warnings +as errors until gettext is updeated to remove the depricated macros. + +Signed-Off-by: Nitin A Kamble <[email protected]> +2012/07/10 + +Index: libidn-1.24/configure.ac +=================================================================== +--- libidn-1.24.orig/configure.ac ++++ libidn-1.24/configure.ac +@@ -23,7 +23,7 @@ AC_COPYRIGHT([Copyright (c) 2002-2011 Si + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADERS(config.h) +-AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override]) ++AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override]) + AM_SILENT_RULES([yes]) + + # Library code modified: REVISION++
meta/recipes-extended/libidn/libidn_1.24.bb +3 -2
@@ -10,12 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c9d9d207a3468a696a03368913d360b \ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ file://lib/idna.h;endline=21;md5=7364f6a250728ffe16170f5e3ab37512 \ file://src/idn.c;endline=20;md5=7d7235e7951ac87d9dfac42e1b69d9cb" -PR = "r1" +PR = "r2" inherit pkgconfig autotools gettext SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ - file://libidn_fix_for_automake-1.12.patch " + file://libidn_fix_for_automake-1.12.patch \ + file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch " SRC_URI[md5sum] = "764d7258eeb273941680499fab2c7367" SRC_URI[sha256sum] = "da1708c6063ecb7951a0908e67df3eacdfe128b18edaa6cf6867d7b73b5f35ff"
Signature · 1 line
1.7.3.4
PATCH 4/4 webgit-gtk: fix build with automake 1.12.1
In reply to [email protected]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
meta/recipes-sato/webkit/files/webgit-gtk_fix_build_with_automake_1.12.patch new file +62 -0
@@ -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 \
meta/recipes-sato/webkit/webkit-gtk_svn.bb +2 -1
@@ -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}/"
Signature · 1 line
1.7.3.4