summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 09:15:39 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-07 15:58:19 (GMT)
commitaa66dc91d3db7b1b800330fbda3dce27ee270214 (patch)
tree0f1f700d3bb1f1d2724642736f9b0251086cccc2
parentb45184aef3b36988f59de088b69da5edc232f348 (diff)
downloadpoky-aa66dc91d3db7b1b800330fbda3dce27ee270214.tar.gz
libxml2/libxslt: Don't depend on ansidecl.h header
We don't DEPEND on binutils for ansidecl.h so ensure we should never use the header. This makes builds determinstic and means something like: bitbake binutils bitbake libxml2 -c configure bitbake binutils -c clean bitbake libxml2 doen't fail to build. (From OE-Core rev: 54d27bbc26d1e45e51ee8ef0f051a2bd8f627cc0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/libxml/libxml2.inc5
-rw-r--r--meta/recipes-support/libxslt/libxslt_1.1.26.bb7
2 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index 2eecbd3..32d6e8c 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -18,6 +18,11 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \
18 18
19inherit autotools pkgconfig binconfig 19inherit autotools pkgconfig binconfig
20 20
21# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
22do_configure_prepend () {
23 sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.in
24}
25
21EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" 26EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
22EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n" 27EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n"
23EXTRA_OECONF_virtclass-nativesdk = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n" 28EXTRA_OECONF_virtclass-nativesdk = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n"
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
index 8986e20..e4cc214 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458"
7 7
8SECTION = "libs" 8SECTION = "libs"
9DEPENDS = "libxml2" 9DEPENDS = "libxml2"
10PR = "r7" 10PR = "r8"
11 11
12SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \ 12SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
13 file://pkgconfig_fix.patch" 13 file://pkgconfig_fix.patch"
@@ -18,6 +18,11 @@ S = "${WORKDIR}/libxslt-${PV}"
18 18
19inherit autotools pkgconfig binconfig lib_package 19inherit autotools pkgconfig binconfig lib_package
20 20
21# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
22do_configure_prepend () {
23 sed -i -e 's/ansidecl.h//' ${S}/configure.in
24}
25
21EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" 26EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
22# older versions of this recipe had ${PN}-utils 27# older versions of this recipe had ${PN}-utils
23RPROVIDES_${PN}-bin += "${PN}-utils" 28RPROVIDES_${PN}-bin += "${PN}-utils"