diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-03-20 09:59:04 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-03-21 13:50:41 +0100 |
commit | bea124794b17bd87d4b1a3a0df30a1f02869c7f0 (patch) | |
tree | 1d7fb700e6a123dcddea012cdb684a7a58c0ef63 /meta-oe | |
parent | 0148de029c33ca496b51700ddf1fcd035a38fc77 (diff) | |
download | meta-openembedded-bea124794b17bd87d4b1a3a0df30a1f02869c7f0.tar.gz |
python-imaging: remove
Fixes from this version have now been merged into OE-Core, so remove
it here.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch | 55 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/python/python-imaging_1.1.7.bb | 41 |
2 files changed, 0 insertions, 96 deletions
diff --git a/meta-oe/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch b/meta-oe/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch deleted file mode 100644 index c6e2ee452..000000000 --- a/meta-oe/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From 07d4f095a9e22ae676a8d68073101131e65012dc Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 15 Nov 2011 13:16:54 +0100 | ||
4 | Subject: [PATCH] python imaging setup.py: force paths for zlib, freetype and jpeg and don't add host paths | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | |||
8 | Upstream-Status: Unknown | ||
9 | --- | ||
10 | setup.py | 14 +++----------- | ||
11 | 1 files changed, 3 insertions(+), 11 deletions(-) | ||
12 | |||
13 | diff --git a/setup.py b/setup.py | ||
14 | index 5d4d53a..b1a22ec 100644 | ||
15 | --- a/setup.py | ||
16 | +++ b/setup.py | ||
17 | @@ -34,10 +34,10 @@ def libinclude(root): | ||
18 | # TIFF_ROOT = libinclude("/opt/tiff") | ||
19 | |||
20 | TCL_ROOT = None | ||
21 | -JPEG_ROOT = None | ||
22 | -ZLIB_ROOT = None | ||
23 | +JPEG_ROOT = os.environ['STAGING_LIBDIR'] | ||
24 | +ZLIB_ROOT = os.environ['STAGING_LIBDIR'] | ||
25 | TIFF_ROOT = None | ||
26 | -FREETYPE_ROOT = None | ||
27 | +FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] | ||
28 | LCMS_ROOT = None | ||
29 | |||
30 | # FIXME: add mechanism to explicitly *disable* the use of a library | ||
31 | @@ -147,7 +147,6 @@ class pil_build_ext(build_ext): | ||
32 | add_directory(library_dirs, "/opt/local/lib") | ||
33 | add_directory(include_dirs, "/opt/local/include") | ||
34 | |||
35 | - add_directory(library_dirs, "/usr/local/lib") | ||
36 | # FIXME: check /opt/stuff directories here? | ||
37 | |||
38 | prefix = sysconfig.get_config_var("prefix") | ||
39 | @@ -207,13 +206,6 @@ class pil_build_ext(build_ext): | ||
40 | if os.path.isfile(os.path.join(tcl_dir, "tk.h")): | ||
41 | add_directory(include_dirs, tcl_dir) | ||
42 | |||
43 | - # standard locations | ||
44 | - add_directory(library_dirs, "/usr/local/lib") | ||
45 | - add_directory(include_dirs, "/usr/local/include") | ||
46 | - | ||
47 | - add_directory(library_dirs, "/usr/lib") | ||
48 | - add_directory(include_dirs, "/usr/include") | ||
49 | - | ||
50 | # | ||
51 | # insert new dirs *before* default libs, to avoid conflicts | ||
52 | # between Python PYD stub libs and real libraries | ||
53 | -- | ||
54 | 1.7.2.5 | ||
55 | |||
diff --git a/meta-oe/recipes-devtools/python/python-imaging_1.1.7.bb b/meta-oe/recipes-devtools/python/python-imaging_1.1.7.bb deleted file mode 100644 index c8dd8147c..000000000 --- a/meta-oe/recipes-devtools/python/python-imaging_1.1.7.bb +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | DESCRIPTION = "Python Imaging Library" | ||
2 | SECTION = "devel/python" | ||
3 | |||
4 | PR = "r1" | ||
5 | |||
6 | LICENSE = "BSD" | ||
7 | LIC_FILES_CHKSUM = "file://README;beginline=92;endline=117;md5=003338c482e1d2eb2e4d862897f3abbf" | ||
8 | |||
9 | DEPENDS = "freetype jpeg tiff" | ||
10 | SRCNAME = "Imaging" | ||
11 | |||
12 | SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ | ||
13 | file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch \ | ||
14 | " | ||
15 | SRC_URI[md5sum] = "fc14a54e1ce02a0225be8854bfba478e" | ||
16 | SRC_URI[sha256sum] = "895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211" | ||
17 | |||
18 | S = "${WORKDIR}/${SRCNAME}-${PV}" | ||
19 | |||
20 | inherit distutils | ||
21 | |||
22 | do_compile() { | ||
23 | export STAGING_LIBDIR=${STAGING_LIBDIR} | ||
24 | export STAGING_INCDIR=${STAGING_INCDIR} | ||
25 | distutils_do_compile | ||
26 | } | ||
27 | |||
28 | do_install() { | ||
29 | export STAGING_LIBDIR=${STAGING_LIBDIR} | ||
30 | export STAGING_INCDIR=${STAGING_INCDIR} | ||
31 | distutils_do_install | ||
32 | install -d ${D}${datadir}/doc/${PN}/html/ | ||
33 | install -m 0644 ${S}/README ${D}${datadir}/doc/${PN}/ | ||
34 | install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${PN}/html/ | ||
35 | |||
36 | # get rid of #!/usr/local/bin/python | ||
37 | sed -i -e 's:/usr/local/bin/:${bindir}/env :g' ${D}${bindir}/* | ||
38 | |||
39 | } | ||
40 | RDEPENDS_${PN} = "python-lang python-stringold" | ||
41 | |||