summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-08-02 12:57:39 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-08-02 12:57:39 +0000
commit807535a52f8344076e6b9ae6d7a0f7171242c98e (patch)
tree2a45cd44633bc194ff6a6dbfd2c6751140d534c5 /meta
parent22c85055348c01f86dffbe926a0eccf8fac3b1f9 (diff)
downloadpoky-807535a52f8344076e6b9ae6d7a0f7171242c98e.tar.gz
libxml2: update to 2.6.29 (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2329 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libxml/files/no-testapi.patch51
-rw-r--r--meta/packages/libxml/libxml2-native_2.6.10.bb16
-rw-r--r--meta/packages/libxml/libxml2-native_2.6.29.bb17
-rw-r--r--meta/packages/libxml/libxml2_2.6.29.bb (renamed from meta/packages/libxml/libxml2_2.6.27.bb)5
-rw-r--r--meta/packages/libxml/libxml2_cvs.bb42
5 files changed, 19 insertions, 112 deletions
diff --git a/meta/packages/libxml/files/no-testapi.patch b/meta/packages/libxml/files/no-testapi.patch
deleted file mode 100644
index 15a4dea0ee..0000000000
--- a/meta/packages/libxml/files/no-testapi.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1--- /tmp/Makefile.am 2005-11-13 14:33:15.844432536 +0100
2+++ libxml2-2.6.22/Makefile.am 2005-11-13 14:33:25.796919528 +0100
3@@ -8,7 +8,7 @@
4
5 noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
6 testThreads testC14N testAutomata testRegexp \
7- testReader testapi testModule runtest runsuite
8+ testReader testModule runtest runsuite
9
10 bin_PROGRAMS = xmllint xmlcatalog
11
12@@ -135,20 +135,9 @@
13 testdso_la_LDFLAGS = -module -rpath $(libdir)
14
15 # that one forces the rebuild when "make rebuild" is run on doc/
16-rebuild_testapi:
17- -@(if [ "$(PYTHON)" != "" ] ; then \
18- $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi )
19
20 # that one is just to make sure it is rebuilt if missing
21 # but adding the dependances generate mess
22-testapi.c:
23- -@(if [ "$(PYTHON)" != "" ] ; then \
24- $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi )
25-
26-testapi_SOURCES=testapi.c
27-testapi_LDFLAGS =
28-testapi_DEPENDENCIES = $(DEPS)
29-testapi_LDADD= $(LDADDS)
30
31 #testOOM_SOURCES=testOOM.c testOOMlib.h testOOMlib.c
32 #testOOM_LDFLAGS =
33@@ -169,9 +158,6 @@
34 @echo '## Go get a cup of coffee it is gonna take a while ...'
35 $(MAKE) CHECKER='valgrind' tests
36
37-APItests: testapi$(EXEEXT)
38- @echo "## Running the API regression tests this may take a little while"
39- -@($(CHECKER) $(top_builddir)/testapi -q)
40
41 HTMLtests : testHTML$(EXEEXT)
42 @(echo > .memdump)
43@@ -1116,7 +1102,7 @@
44 dist-test: distdir
45 (mkdir -p $(distdir))
46 (cd $(srcdir) ; tar -cf - --exclude CVS xstc/Tests) | (cd $(distdir); tar xf -)
47- tar -cf - $(distdir)/test $(distdir)/result $(distdir)/xstc/Tests $(distdir)/Makefile.tests $(distdir)/README $(distdir)/README.tests $(distdir)/AUTHORS $(distdir)/testapi.c $(distdir)/runtest.c $(distdir)/runsuite.c | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-tests+"`.tar.gz
48+ tar -cf - $(distdir)/test $(distdir)/result $(distdir)/xstc/Tests $(distdir)/Makefile.tests $(distdir)/README $(distdir)/README.tests $(distdir)/AUTHORS $(distdir)/runtest.c $(distdir)/runsuite.c | GZIP=$(GZIP_ENV) gzip -c >`echo "$(distdir)" | sed "s+libxml2+libxml2-tests+"`.tar.gz
49 @(rm -rf $(distdir)/xstc/Test)
50
51 cleantar:
diff --git a/meta/packages/libxml/libxml2-native_2.6.10.bb b/meta/packages/libxml/libxml2-native_2.6.10.bb
deleted file mode 100644
index 3f4b1ca11b..0000000000
--- a/meta/packages/libxml/libxml2-native_2.6.10.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1DESCRIPTION = "GNOME XML library"
2
3SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxml2-${PV}.tar.gz"
4
5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
6S = "${WORKDIR}/libxml2-${PV}"
7
8inherit autotools native pkgconfig
9
10EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n"
11
12headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
13
14do_stage () {
15 oe_runmake install
16}
diff --git a/meta/packages/libxml/libxml2-native_2.6.29.bb b/meta/packages/libxml/libxml2-native_2.6.29.bb
new file mode 100644
index 0000000000..fc9c3697de
--- /dev/null
+++ b/meta/packages/libxml/libxml2-native_2.6.29.bb
@@ -0,0 +1,17 @@
1DESCRIPTION = "GNOME XML library"
2PR = "r1"
3
4SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
5
6DEPENDS = "python-native"
7
8FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
9S = "${WORKDIR}/libxml2-${PV}"
10
11inherit autotools native pkgconfig
12
13EXTRA_OECONF = "--with-python=${STAGING_INCDIR}/python2.4 --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
14
15do_stage () {
16 oe_runmake install
17}
diff --git a/meta/packages/libxml/libxml2_2.6.27.bb b/meta/packages/libxml/libxml2_2.6.29.bb
index e330050b81..12fb6ca08e 100644
--- a/meta/packages/libxml/libxml2_2.6.27.bb
+++ b/meta/packages/libxml/libxml2_2.6.29.bb
@@ -4,12 +4,11 @@ PRIORITY = "optional"
4LICENSE = "MIT" 4LICENSE = "MIT"
5PR = "r4" 5PR = "r4"
6 6
7SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \ 7SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
8 file://no-testapi.patch;patch=1"
9 8
10inherit autotools pkgconfig binconfig 9inherit autotools pkgconfig binconfig
11 10
12EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n --without-schemas --without-schematron --with-reader" 11EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
13 12
14export LDFLAGS += "-ldl" 13export LDFLAGS += "-ldl"
15 14
diff --git a/meta/packages/libxml/libxml2_cvs.bb b/meta/packages/libxml/libxml2_cvs.bb
deleted file mode 100644
index f83b66c310..0000000000
--- a/meta/packages/libxml/libxml2_cvs.bb
+++ /dev/null
@@ -1,42 +0,0 @@
1DEFAULT_PREFERENCE = "-1"
2PR = "r0"
3DESCRIPTION = "GNOME XML library"
4SECTION = "libs"
5PRIORITY = "optional"
6LICENSE = "MIT"
7PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
8
9FILES_${PN}-dev += "${bindir}/xml-config"
10FILES_${PN}-utils += "${bindir}/*"
11
12PV = "2.6.23+cvs${SRCDATE}"
13S = "${WORKDIR}/${PN}"
14SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libxml2"
15
16inherit autotools pkgconfig
17
18EXTRA_OECONF = "--without-python --without-debug --without-legacy --with-schemas --without-catalog --without-docbook --without-c14n"
19
20headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
21
22do_stage () {
23 oe_libinstall -so libxml2 ${STAGING_LIBDIR}
24
25 mkdir -p ${STAGING_INCDIR}/libxml2/libxml
26 for i in ${headers}; do
27 install -m 0644 include/libxml/$i ${STAGING_INCDIR}/libxml2/libxml/$i
28 done
29
30 cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
31 -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
32 -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
33 -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xml2-config
34 chmod a+rx ${STAGING_BINDIR}/xml2-config
35 install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
36}
37
38python populate_packages_prepend () {
39 # autonamer would call this libxml2-2, but we don't want that
40 if bb.data.getVar('DEBIAN_NAMES', d, 1):
41 bb.data.setVar('PKG_libxml2', 'libxml2', d)
42}