diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-24 19:39:46 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-09-24 19:39:46 +0000 |
| commit | ffdc33ee9f98213b0206cbbd8496ec3b48ae1c8f (patch) | |
| tree | b83355fd177bb16b3309ba991b02d2815c42d7c1 /packages/python | |
| parent | 4f7b18b2325b460f224f13ad1f562ee4489e9e56 (diff) | |
| parent | 1afd7b0bd9371f8bb52f7f63edcbca4e4e2af998 (diff) | |
merge of '2e75cbd37f40c36e60bc1e60a02e967304b6b338'
and '887e1a4016c96ca69eca2047591511a955459515'
Diffstat (limited to 'packages/python')
| -rw-r--r-- | packages/python/python-pycairo/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/python/python-pycairo/fix-setup-py.patch | 24 | ||||
| -rw-r--r-- | packages/python/python-pycairo_1.4.0.bb | 12 |
3 files changed, 31 insertions, 5 deletions
diff --git a/packages/python/python-pycairo/.mtn2git_empty b/packages/python/python-pycairo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-pycairo/.mtn2git_empty diff --git a/packages/python/python-pycairo/fix-setup-py.patch b/packages/python/python-pycairo/fix-setup-py.patch new file mode 100644 index 0000000000..6165184448 --- /dev/null +++ b/packages/python/python-pycairo/fix-setup-py.patch @@ -0,0 +1,24 @@ +diff -urN pycairo-1.4.0.orig/setup.py pycairo-1.4.0/setup.py +--- pycairo-1.4.0.orig/setup.py 2007-03-14 10:53:30.000000000 +0100 ++++ pycairo-1.4.0/setup.py 2008-09-23 18:55:25.000000000 +0200 +@@ -37,20 +37,6 @@ + runtime_library_dirs = pkg_config_parse('--libs-only-L', 'cairo') + + pkgconfig_file='pycairo.pc' +-print 'creating %s' % pkgconfig_file +-fo = open (pkgconfig_file, 'w') +-fo.write ("""\ +-prefix=%s +- +-Name: Pycairo +-Description: Python bindings for cairo +-Version: %s +-Requires: cairo +-Cflags: -I${prefix}/include/pycairo +-Libs: +-""" % (sys.prefix, pycairo_version) +- ) +-fo.close() + + cairo = dic.Extension( + name = 'cairo._cairo', diff --git a/packages/python/python-pycairo_1.4.0.bb b/packages/python/python-pycairo_1.4.0.bb index 9bb2fdfcd8..bd3c1a7aa0 100644 --- a/packages/python/python-pycairo_1.4.0.bb +++ b/packages/python/python-pycairo_1.4.0.bb @@ -3,17 +3,19 @@ SECTION = "python-devel" HOMEPAGE = "http://cairographics.org/pycairo" LICENSE = "LGPL MPL" DEPENDS = "cairo" -PR = "ml1" +PR = "ml2" -SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz" +SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.gz \ + file://fix-setup-py.patch;patch=1" S = "${WORKDIR}/pycairo-${PV}" inherit distutils pkgconfig +do_configure_append() { + sed -e 's:@prefix@:${prefix}:' -e 's:@includedir@:\$\{prefix\}/include:' -e 's:@VERSION@:${PV}:' pycairo.pc.in > pycairo.pc +} + do_stage() { install -d ${STAGING_INCDIR} install -m 0644 cairo/pycairo.h ${STAGING_INCDIR} - - # nasty pkgconfig fix necessary here - sed -i -e s,${STAGING_DIR_NATIVE},, pycairo.pc } |