diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-12-18 08:09:09 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-12-18 08:09:09 +0000 |
| commit | c3fb3617fdbf43c5a9796eeceee5bcd0e54c9f65 (patch) | |
| tree | 600d906920b09204024c5ff33a762104ada6c2a6 | |
| parent | d4b9227e9598532bcc7fecefe6e33792c2c05d2d (diff) | |
| download | openembedded-core-c3fb3617fdbf43c5a9796eeceee5bcd0e54c9f65.tar.gz openembedded-core-c3fb3617fdbf43c5a9796eeceee5bcd0e54c9f65.tar.bz2 openembedded-core-c3fb3617fdbf43c5a9796eeceee5bcd0e54c9f65.zip | |
libxml2: added fix for 'unable to find gzopen64()' when host is 64bit (taken from Debian)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3339 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/libxml/files/libxml-64bit.patch | 20 | ||||
| -rw-r--r-- | meta/packages/libxml/libxml2-native_2.6.29.bb | 11 | ||||
| -rw-r--r-- | meta/packages/libxml/libxml2.inc | 11 | ||||
| -rw-r--r-- | meta/packages/libxml/libxml2_2.6.29.bb | 12 |
4 files changed, 37 insertions, 17 deletions
diff --git a/meta/packages/libxml/files/libxml-64bit.patch b/meta/packages/libxml/files/libxml-64bit.patch new file mode 100644 index 0000000000..fcb7d34fa7 --- /dev/null +++ b/meta/packages/libxml/files/libxml-64bit.patch @@ -0,0 +1,20 @@ +--- + libxml.h | 3 +++ + 1 file changed, 3 insertions(+) + +--- libxml2-2.6.29.orig/libxml.h ++++ libxml2-2.6.29/libxml.h +@@ -11,10 +11,13 @@ + + #ifndef NO_LARGEFILE_SOURCE + #ifndef _LARGEFILE_SOURCE + #define _LARGEFILE_SOURCE + #endif ++#ifndef _LARGEFILE64_SOURCE ++#define _LARGEFILE64_SOURCE ++#endif + #ifndef _FILE_OFFSET_BITS + #define _FILE_OFFSET_BITS 64 + #endif + #endif + diff --git a/meta/packages/libxml/libxml2-native_2.6.29.bb b/meta/packages/libxml/libxml2-native_2.6.29.bb index 7c397d471d..4f7a801495 100644 --- a/meta/packages/libxml/libxml2-native_2.6.29.bb +++ b/meta/packages/libxml/libxml2-native_2.6.29.bb @@ -1,16 +1,13 @@ -DESCRIPTION = "GNOME XML library" -PR = "r3" +require libxml2.inc -SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz" +PR = "r4" -DEPENDS = "python-native-runtime" +DEPENDS += "python-native-runtime" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}" S = "${WORKDIR}/libxml2-${PV}" -inherit autotools native pkgconfig - -EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" +inherit native do_stage () { oe_runmake install diff --git a/meta/packages/libxml/libxml2.inc b/meta/packages/libxml/libxml2.inc new file mode 100644 index 0000000000..4e6e527603 --- /dev/null +++ b/meta/packages/libxml/libxml2.inc @@ -0,0 +1,11 @@ +DESCRIPTION = "GNOME XML Parser library" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" + +SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \ + file://libxml-64bit.patch;patch=1" + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" diff --git a/meta/packages/libxml/libxml2_2.6.29.bb b/meta/packages/libxml/libxml2_2.6.29.bb index 521ba16d9b..3b4bac673a 100644 --- a/meta/packages/libxml/libxml2_2.6.29.bb +++ b/meta/packages/libxml/libxml2_2.6.29.bb @@ -1,14 +1,6 @@ -DESCRIPTION = "GNOME XML Parser library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "MIT" -PR = "r5" +require libxml2.inc -SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz" - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" +PR = "r6" export LDFLAGS += "-ldl" |