diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/python/python-lxml/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/python/python-lxml/use-pkgconfig-to-detect.patch | 31 | ||||
-rw-r--r-- | packages/python/python-lxml_1.3.3.bb | 5 |
3 files changed, 34 insertions, 2 deletions
diff --git a/packages/python/python-lxml/.mtn2git_empty b/packages/python/python-lxml/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-lxml/.mtn2git_empty diff --git a/packages/python/python-lxml/use-pkgconfig-to-detect.patch b/packages/python/python-lxml/use-pkgconfig-to-detect.patch new file mode 100644 index 0000000000..b79f1b2300 --- /dev/null +++ b/packages/python/python-lxml/use-pkgconfig-to-detect.patch @@ -0,0 +1,31 @@ +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/packages/python/python-lxml_1.3.3.bb b/packages/python/python-lxml_1.3.3.bb index de0566e38f..7ead15b2a0 100644 --- a/packages/python/python-lxml_1.3.3.bb +++ b/packages/python/python-lxml_1.3.3.bb @@ -3,9 +3,10 @@ HOMEPAGE = "http://codespeak.net/lxml/" AUTHOR = "http://codespeak.net/mailman/listinfo/lxml-dev" LICENSE = "BSD" DEPENDS = "libxml2 libxslt" -PR = "ml0" +PR = "ml1" -SRC_URI = "http://codespeak.net/lxml/lxml-${PV}.tgz" +SRC_URI = "http://codespeak.net/lxml/lxml-${PV}.tgz \ + file://use-pkgconfig-to-detect.patch;patch=1" S = "${WORKDIR}/lxml-${PV}" inherit distutils |