mirror of
https://git.yoctoproject.org/poky
synced 2026-04-30 21:32:13 +02:00
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
This commit is contained in:
Marcin Juszkiewicz
@@ -1,51 +0,0 @@
|
||||
--- /tmp/Makefile.am 2005-11-13 14:33:15.844432536 +0100
|
||||
+++ libxml2-2.6.22/Makefile.am 2005-11-13 14:33:25.796919528 +0100
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
|
||||
testThreads testC14N testAutomata testRegexp \
|
||||
- testReader testapi testModule runtest runsuite
|
||||
+ testReader testModule runtest runsuite
|
||||
|
||||
bin_PROGRAMS = xmllint xmlcatalog
|
||||
|
||||
@@ -135,20 +135,9 @@
|
||||
testdso_la_LDFLAGS = -module -rpath $(libdir)
|
||||
|
||||
# that one forces the rebuild when "make rebuild" is run on doc/
|
||||
-rebuild_testapi:
|
||||
- -@(if [ "$(PYTHON)" != "" ] ; then \
|
||||
- $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi )
|
||||
|
||||
# that one is just to make sure it is rebuilt if missing
|
||||
# but adding the dependances generate mess
|
||||
-testapi.c:
|
||||
- -@(if [ "$(PYTHON)" != "" ] ; then \
|
||||
- $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi )
|
||||
-
|
||||
-testapi_SOURCES=testapi.c
|
||||
-testapi_LDFLAGS =
|
||||
-testapi_DEPENDENCIES = $(DEPS)
|
||||
-testapi_LDADD= $(LDADDS)
|
||||
|
||||
#testOOM_SOURCES=testOOM.c testOOMlib.h testOOMlib.c
|
||||
#testOOM_LDFLAGS =
|
||||
@@ -169,9 +158,6 @@
|
||||
@echo '## Go get a cup of coffee it is gonna take a while ...'
|
||||
$(MAKE) CHECKER='valgrind' tests
|
||||
|
||||
-APItests: testapi$(EXEEXT)
|
||||
- @echo "## Running the API regression tests this may take a little while"
|
||||
- -@($(CHECKER) $(top_builddir)/testapi -q)
|
||||
|
||||
HTMLtests : testHTML$(EXEEXT)
|
||||
@(echo > .memdump)
|
||||
@@ -1116,7 +1102,7 @@
|
||||
dist-test: distdir
|
||||
(mkdir -p $(distdir))
|
||||
(cd $(srcdir) ; tar -cf - --exclude CVS xstc/Tests) | (cd $(distdir); tar xf -)
|
||||
- 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
|
||||
+ 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
|
||||
@(rm -rf $(distdir)/xstc/Test)
|
||||
|
||||
cleantar:
|
||||
@@ -1,16 +0,0 @@
|
||||
DESCRIPTION = "GNOME XML library"
|
||||
|
||||
SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxml2-${PV}.tar.gz"
|
||||
|
||||
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-schemas --without-catalog --without-docbook --without-c14n"
|
||||
|
||||
headers = "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"
|
||||
|
||||
do_stage () {
|
||||
oe_runmake install
|
||||
}
|
||||
17
meta/packages/libxml/libxml2-native_2.6.29.bb
Normal file
17
meta/packages/libxml/libxml2-native_2.6.29.bb
Normal file
@@ -0,0 +1,17 @@
|
||||
DESCRIPTION = "GNOME XML library"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
|
||||
|
||||
DEPENDS = "python-native"
|
||||
|
||||
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
|
||||
S = "${WORKDIR}/libxml2-${PV}"
|
||||
|
||||
inherit autotools native pkgconfig
|
||||
|
||||
EXTRA_OECONF = "--with-python=${STAGING_INCDIR}/python2.4 --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
|
||||
|
||||
do_stage () {
|
||||
oe_runmake install
|
||||
}
|
||||
@@ -4,12 +4,11 @@ PRIORITY = "optional"
|
||||
LICENSE = "MIT"
|
||||
PR = "r4"
|
||||
|
||||
SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \
|
||||
file://no-testapi.patch;patch=1"
|
||||
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 --without-schemas --without-schematron --with-reader"
|
||||
EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
|
||||
|
||||
export LDFLAGS += "-ldl"
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
PR = "r0"
|
||||
DESCRIPTION = "GNOME XML library"
|
||||
SECTION = "libs"
|
||||
PRIORITY = "optional"
|
||||
LICENSE = "MIT"
|
||||
PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
|
||||
|
||||
FILES_${PN}-dev += "${bindir}/xml-config"
|
||||
FILES_${PN}-utils += "${bindir}/*"
|
||||
|
||||
PV = "2.6.23+cvs${SRCDATE}"
|
||||
S = "${WORKDIR}/${PN}"
|
||||
SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libxml2"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
EXTRA_OECONF = "--without-python --without-debug --without-legacy --with-schemas --without-catalog --without-docbook --without-c14n"
|
||||
|
||||
headers = "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"
|
||||
|
||||
do_stage () {
|
||||
oe_libinstall -so libxml2 ${STAGING_LIBDIR}
|
||||
|
||||
mkdir -p ${STAGING_INCDIR}/libxml2/libxml
|
||||
for i in ${headers}; do
|
||||
install -m 0644 include/libxml/$i ${STAGING_INCDIR}/libxml2/libxml/$i
|
||||
done
|
||||
|
||||
cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
|
||||
-e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
|
||||
-e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
|
||||
-e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xml2-config
|
||||
chmod a+rx ${STAGING_BINDIR}/xml2-config
|
||||
install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
|
||||
}
|
||||
|
||||
python populate_packages_prepend () {
|
||||
# autonamer would call this libxml2-2, but we don't want that
|
||||
if bb.data.getVar('DEBIAN_NAMES', d, 1):
|
||||
bb.data.setVar('PKG_libxml2', 'libxml2', d)
|
||||
}
|
||||
Reference in New Issue
Block a user