summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-02 17:08:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-07 15:58:19 +0000
commitb45184aef3b36988f59de088b69da5edc232f348 (patch)
tree6353c0d32a1fa166914b309b8b79fec732774708
parent0e43be806d15f752f640e3863f6064c57949b722 (diff)
downloadpoky-b45184aef3b36988f59de088b69da5edc232f348.tar.gz
poky-b45184aef3b36988f59de088b69da5edc232f348.tar.bz2
poky-b45184aef3b36988f59de088b69da5edc232f348.zip
libxml2: fix build with automake 1.12
(From OE-Core rev: dd1b77c473ee92608ad0a5bdbea0880d2f613c2c) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/libxml/libxml2/libxml2_fix_for_automake_1.12.patch23
-rw-r--r--meta/recipes-core/libxml/libxml2_2.7.8.bb5
2 files changed, 26 insertions, 2 deletions
diff --git a/meta/recipes-core/libxml/libxml2/libxml2_fix_for_automake_1.12.patch b/meta/recipes-core/libxml/libxml2/libxml2_fix_for_automake_1.12.patch
new file mode 100644
index 0000000000..5c25882fab
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/libxml2_fix_for_automake_1.12.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Pending
+
+automake 1.12 has decpricated automatic de-ANSI-fication support
+
+this patch fixes this build issue:
+
+| configure.in:67: error: automatic de-ANSI-fication support has been removed
+Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/02
+
+Index: libxml2-2.7.8/configure.in
+===================================================================
+--- libxml2-2.7.8.orig/configure.in
++++ libxml2-2.7.8/configure.in
+@@ -63,8 +63,6 @@ AC_PATH_PROG(WGET, wget, /usr/bin/wget)
+ AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint)
+ AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc)
+
+-dnl Make sure we have an ANSI compiler
+-AM_C_PROTOTYPES
+ test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant)
+
+ AC_LIBTOOL_WIN32_DLL
diff --git a/meta/recipes-core/libxml/libxml2_2.7.8.bb b/meta/recipes-core/libxml/libxml2_2.7.8.bb
index 1de73da5a1..9111120668 100644
--- a/meta/recipes-core/libxml/libxml2_2.7.8.bb
+++ b/meta/recipes-core/libxml/libxml2_2.7.8.bb
@@ -1,8 +1,9 @@
require libxml2.inc
-PR = "r7"
+PR = "r8"
-SRC_URI += "file://fix_version_info.patch"
+SRC_URI += "file://fix_version_info.patch \
+ file://libxml2_fix_for_automake_1.12.patch"
SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86"
SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"