[OE-core] [PATCH 1/8] libxml2: enable Catalog support

2014-07-08 Thread Hongxu Jia 
The environment variable XML_CATALOG_FILES could work
which was required by xmlto.

[YOCTO #2416]

Signed-off-by: Hongxu Jia 
---
 meta/recipes-core/libxml/libxml2.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-core/libxml/libxml2.inc 
b/meta/recipes-core/libxml/libxml2.inc
index e0b50cf..470ac3f 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -28,6 +28,8 @@ inherit autotools pkgconfig binconfig-disabled pythonnative 
ptest
 
 RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us 
eglibc-gconv-ibm1141"
 
+CFLAGS_append = " -DLIBXML_CATALOG_ENABLED"
+
 # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
 do_configure_prepend () {
sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.in
-- 
1.8.1.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/8] libxml2: enable catalog support

2014-07-09 Thread Hongxu Jia 
It let the environment variable XML_CATALOG_FILES could work
which was required by xmlto.

[YOCTO #2416]

Signed-off-by: Hongxu Jia 
---
 meta/recipes-core/libxml/libxml2.inc | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/libxml/libxml2.inc 
b/meta/recipes-core/libxml/libxml2.inc
index e0b50cf..9aa640b 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -38,10 +38,10 @@ do_configure_prepend_class-nativesdk () {
export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}"
 }
 
-EXTRA_OECONF = "--without-python --without-debug --without-legacy 
--without-catalog --without-docbook --with-c14n --without-lzma 
--with-fexceptions"
-EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python 
--without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
-EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python 
--without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
-EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy 
--with-catalog --with-docbook --with-c14n --without-lzma"
+EXTRA_OECONF = "--without-python --without-debug --without-legacy 
--with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions"
+EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python 
--without-legacy --without-docbook --with-c14n --without-lzma"
+EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python 
--without-legacy --without-docbook --with-c14n --without-lzma"
+EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy 
--with-docbook --with-c14n --without-lzma"
 
 # required for pythong binding
 export HOST_SYS
-- 
1.8.1.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/8] libxml2: enable catalog support

2014-07-15 Thread Hongxu Jia 
It let the environment variable XML_CATALOG_FILES could work
which was required by xmlto.

[YOCTO #2416]

Signed-off-by: Hongxu Jia 
---
 meta/recipes-core/libxml/libxml2.inc | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/libxml/libxml2.inc 
b/meta/recipes-core/libxml/libxml2.inc
index e0b50cf..9aa640b 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -38,10 +38,10 @@ do_configure_prepend_class-nativesdk () {
export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}"
 }
 
-EXTRA_OECONF = "--without-python --without-debug --without-legacy 
--without-catalog --without-docbook --with-c14n --without-lzma 
--with-fexceptions"
-EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python 
--without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
-EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python 
--without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
-EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy 
--with-catalog --with-docbook --with-c14n --without-lzma"
+EXTRA_OECONF = "--without-python --without-debug --without-legacy 
--with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions"
+EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python 
--without-legacy --without-docbook --with-c14n --without-lzma"
+EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python 
--without-legacy --without-docbook --with-c14n --without-lzma"
+EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy 
--with-docbook --with-c14n --without-lzma"
 
 # required for pythong binding
 export HOST_SYS
-- 
1.8.1.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/8] libxml2: enable Catalog support

2014-07-08 Thread Burton, Ross 
On 8 July 2014 10:47, Hongxu Jia  wrote:
> +CFLAGS_append = " -DLIBXML_CATALOG_ENABLED"

EXTRA_OECONF has --without-catalog, so you should change that instead
of passing CFLAGS directly.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core