path: root/meta/recipes-core/libxml/libxml2
diff options
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-10 12:04:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-10 14:24:44 +0100
commitbfaaeb44c5023e2d2a9414c07694c75fa527283b (patch)
tree2216fb1dbaa679a2c41e4941a0d096fc764a590e /meta/recipes-core/libxml/libxml2
parent7dd2a12ebe49865720dcea60cd2ed13205c0c4fd (diff)
libxml2: Fix libzypp ansidecl related build failures
cmake looks at all include statements, even if they're not used. To make builds deterministic and avoid needing to add binutils as a dependency for libzypp, completely remove the include from the header file, even if it is never used. This avoids issues where you'd build binutils, then libzypp, then remove binutils (and hence ansidecl.h) and then recompile libzypp which would still have the dependency and hence fail. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml/libxml2')
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-core/libxml/libxml2/ansidecl.patch b/meta/recipes-core/libxml/libxml2/ansidecl.patch
new file mode 100644
index 0000000000..2452d780d5
--- /dev/null
+++ b/meta/recipes-core/libxml/libxml2/ansidecl.patch
@@ -0,0 +1,25 @@
+Sadly cmake is broken. If it sees this reference and ansidecl is present, it will add a
+dependency upon it, even if HAVE_ANSIDEC_H is never set.
+The easiest solution is to remove these lines, otherwise recipes like libzypp can have a
+dependency on the ansidecl.h header via cmake. This can lead to odd results if the
+header is removed (clean binutils) and then the code is recompiled.
+RP 2012/7/10
+Upstream-Status: Inappropriate [its really a cmake bug]
+Index: libxml2-2.8.0/include/libxml/xmlversion.h.in
+--- libxml2-2.8.0.orig/include/libxml/xmlversion.h.in 2012-07-10 11:51:52.460750573 +0000
++++ libxml2-2.8.0/include/libxml/xmlversion.h.in 2012-07-10 11:52:41.436749397 +0000
+@@ -401,9 +401,6 @@
+ #endif
+ #ifdef __GNUC__
+-#include <ansidecl.h>
+ /**