diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/libxml/libxml2.inc | 3 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2/ansidecl.patch | 25 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.8.0.bb | 2 |
3 files changed, 28 insertions, 2 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index 943363136c..d70fe479d1 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc | |||
@@ -13,7 +13,8 @@ DEPENDS_virtclass-native = "python-native" | |||
13 | DEPENDS =+ "zlib" | 13 | DEPENDS =+ "zlib" |
14 | 14 | ||
15 | SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \ | 15 | SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \ |
16 | file://libxml-64bit.patch" | 16 | file://libxml-64bit.patch \ |
17 | file://ansidecl.patch" | ||
17 | 18 | ||
18 | 19 | ||
19 | inherit autotools pkgconfig binconfig | 20 | inherit autotools pkgconfig binconfig |
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 @@ | |||
1 | Sadly cmake is broken. If it sees this reference and ansidecl is present, it will add a | ||
2 | dependency upon it, even if HAVE_ANSIDEC_H is never set. | ||
3 | |||
4 | The easiest solution is to remove these lines, otherwise recipes like libzypp can have a | ||
5 | dependency on the ansidecl.h header via cmake. This can lead to odd results if the | ||
6 | header is removed (clean binutils) and then the code is recompiled. | ||
7 | |||
8 | RP 2012/7/10 | ||
9 | |||
10 | Upstream-Status: Inappropriate [its really a cmake bug] | ||
11 | |||
12 | Index: libxml2-2.8.0/include/libxml/xmlversion.h.in | ||
13 | =================================================================== | ||
14 | --- libxml2-2.8.0.orig/include/libxml/xmlversion.h.in 2012-07-10 11:51:52.460750573 +0000 | ||
15 | +++ libxml2-2.8.0/include/libxml/xmlversion.h.in 2012-07-10 11:52:41.436749397 +0000 | ||
16 | @@ -401,9 +401,6 @@ | ||
17 | #endif | ||
18 | |||
19 | #ifdef __GNUC__ | ||
20 | -#ifdef HAVE_ANSIDECL_H | ||
21 | -#include <ansidecl.h> | ||
22 | -#endif | ||
23 | |||
24 | /** | ||
25 | * ATTRIBUTE_UNUSED: | ||
diff --git a/meta/recipes-core/libxml/libxml2_2.8.0.bb b/meta/recipes-core/libxml/libxml2_2.8.0.bb index fe9ec0526b..37eba34e31 100644 --- a/meta/recipes-core/libxml/libxml2_2.8.0.bb +++ b/meta/recipes-core/libxml/libxml2_2.8.0.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require libxml2.inc | 1 | require libxml2.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | 4 | ||
5 | SRC_URI[md5sum] = "c62106f02ee00b6437f0fb9d370c1093" | 5 | SRC_URI[md5sum] = "c62106f02ee00b6437f0fb9d370c1093" |
6 | SRC_URI[sha256sum] = "f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a" | 6 | SRC_URI[sha256sum] = "f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a" |