From 015e3eca85c779cd78080f81c9d056be223465d1 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 10 Jul 2012 02:17:44 -0700 Subject: libunistring: fix build with automake 1.12 Added a new patch: libunistring/libunistring_fix_for_automake_1.12.patch More comments in the patch header. Signed-off-by: Nitin A Kamble Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../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 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 @@ +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 +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 \ diff --git a/meta/recipes-support/libunistring/libunistring_0.9.3.bb b/meta/recipes-support/libunistring/libunistring_0.9.3.bb index 02a28f40b3..454a0e6c35 100644 --- a/meta/recipes-support/libunistring/libunistring_0.9.3.bb +++ b/meta/recipes-support/libunistring/libunistring_0.9.3.bb @@ -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" -- cgit 1.2.3-korg