From 163489ebbfd592252adec0c11006aa9ab3915c13 Mon Sep 17 00:00:00 2001 From: Michael Lippautz Date: Thu, 8 Apr 2010 12:16:56 +0200 Subject: python-lxml: Fix recipe. * Use latest version * Remove nonworking copy and unused patch * Move recipe to python/ dir Signed-off-by: Michael Lippautz --- recipes/nonworking/python-lxml_2.1.5.bb | 12 --------- .../python-lxml/use-pkgconfig-to-detect.patch | 31 ---------------------- recipes/python/python-lxml_2.2.6.bb | 26 ++++++++++++++++++ 3 files changed, 26 insertions(+), 43 deletions(-) delete mode 100644 recipes/nonworking/python-lxml_2.1.5.bb delete mode 100644 recipes/python/python-lxml/use-pkgconfig-to-detect.patch create mode 100644 recipes/python/python-lxml_2.2.6.bb diff --git a/recipes/nonworking/python-lxml_2.1.5.bb b/recipes/nonworking/python-lxml_2.1.5.bb deleted file mode 100644 index de0566e38f..0000000000 --- a/recipes/nonworking/python-lxml_2.1.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Python Bindings to the XML libraries libxml2 and libxslt" -HOMEPAGE = "http://codespeak.net/lxml/" -AUTHOR = "http://codespeak.net/mailman/listinfo/lxml-dev" -LICENSE = "BSD" -DEPENDS = "libxml2 libxslt" -PR = "ml0" - -SRC_URI = "http://codespeak.net/lxml/lxml-${PV}.tgz" -S = "${WORKDIR}/lxml-${PV}" - -inherit distutils - diff --git a/recipes/python/python-lxml/use-pkgconfig-to-detect.patch b/recipes/python/python-lxml/use-pkgconfig-to-detect.patch deleted file mode 100644 index b79f1b2300..0000000000 --- a/recipes/python/python-lxml/use-pkgconfig-to-detect.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: lxml-1.3.3/setupinfo.py -=================================================================== ---- lxml-1.3.3.orig/setupinfo.py 2007-08-20 22:39:09.000000000 +0000 -+++ lxml-1.3.3/setupinfo.py 2007-08-20 22:39:46.000000000 +0000 -@@ -86,7 +86,7 @@ - return static_library_dirs - # filter them from xslt-config --libs - result = [] -- possible_library_dirs = flags('xslt-config --libs') -+ possible_library_dirs = flags('pkg-config libxslt --libs') - for possible_library_dir in possible_library_dirs: - if possible_library_dir.startswith('-L'): - result.append(possible_library_dir[2:]) -@@ -100,7 +100,7 @@ - return static_include_dirs - # filter them from xslt-config --cflags - result = [] -- possible_include_dirs = flags('xslt-config --cflags') -+ possible_include_dirs = flags('pkg-config libxslt --cflags') - for possible_include_dir in possible_include_dirs: - if possible_include_dir.startswith('-I'): - result.append(possible_include_dir[2:]) -@@ -119,7 +119,7 @@ - return result - - # anything from xslt-config --cflags that doesn't start with -I -- possible_cflags = flags('xslt-config --cflags') -+ possible_cflags = flags('pkg-config libxslt --cflags') - for possible_cflag in possible_cflags: - if not possible_cflag.startswith('-I'): - result.append(possible_cflag) diff --git a/recipes/python/python-lxml_2.2.6.bb b/recipes/python/python-lxml_2.2.6.bb new file mode 100644 index 0000000000..93280f1fb4 --- /dev/null +++ b/recipes/python/python-lxml_2.2.6.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Powerful and Pythonic XML processing library combining \ +libxml2/libxslt with the ElementTree API." +HOMEPAGE = "http://codespeak.net/lxml" +LICENSE = "BSD" +SRCNAME = "lxml" +PR = "r0" +DEPENDS = "libxml2 libxslt" +RDEPENDS_${PN} += "libxml2 libxslt python-compression" + +SRC_URI = "http://pypi.python.org/packages/source/l/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;name=lxml" +SRC_URI[lxml.md5sum] = "b1f700fb22d7ee9b977ee3eceb65b20c" +SRC_URI[lxml.sha256sum] = "7fd36e4a56360cd5d7319e357b04a90e2c6b836ea220c88f9451c300ae33cc5e" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools + +DISTUTILS_BUILD_ARGS += " \ + --with-xslt-config='${STAGING_BINDIR_NATIVE}/pkg-config libxslt' \ + --with-xml2-config='${STAGING_BINDIR_NATIVE}/xml2-config' \ +" + +DISTUTILS_INSTALL_ARGS += " \ + --with-xslt-config='${STAGING_BINDIR_NATIVE}/pkg-config libxslt' \ + --with-xml2-config='${STAGING_BINDIR_NATIVE}/xml2-config' \ +" -- cgit 1.2.3-korg