mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-31 01:10:08 +00:00
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>
This commit is contained in:
-55
@@ -1,55 +0,0 @@
|
|||||||
From 07d4f095a9e22ae676a8d68073101131e65012dc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
|
||||||
Date: Tue, 15 Nov 2011 13:16:54 +0100
|
|
||||||
Subject: [PATCH] python imaging setup.py: force paths for zlib, freetype and jpeg and don't add host paths
|
|
||||||
|
|
||||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
|
||||||
|
|
||||||
Upstream-Status: Unknown
|
|
||||||
---
|
|
||||||
setup.py | 14 +++-----------
|
|
||||||
1 files changed, 3 insertions(+), 11 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index 5d4d53a..b1a22ec 100644
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -34,10 +34,10 @@ def libinclude(root):
|
|
||||||
# TIFF_ROOT = libinclude("/opt/tiff")
|
|
||||||
|
|
||||||
TCL_ROOT = None
|
|
||||||
-JPEG_ROOT = None
|
|
||||||
-ZLIB_ROOT = None
|
|
||||||
+JPEG_ROOT = os.environ['STAGING_LIBDIR']
|
|
||||||
+ZLIB_ROOT = os.environ['STAGING_LIBDIR']
|
|
||||||
TIFF_ROOT = None
|
|
||||||
-FREETYPE_ROOT = None
|
|
||||||
+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
|
|
||||||
LCMS_ROOT = None
|
|
||||||
|
|
||||||
# FIXME: add mechanism to explicitly *disable* the use of a library
|
|
||||||
@@ -147,7 +147,6 @@ class pil_build_ext(build_ext):
|
|
||||||
add_directory(library_dirs, "/opt/local/lib")
|
|
||||||
add_directory(include_dirs, "/opt/local/include")
|
|
||||||
|
|
||||||
- add_directory(library_dirs, "/usr/local/lib")
|
|
||||||
# FIXME: check /opt/stuff directories here?
|
|
||||||
|
|
||||||
prefix = sysconfig.get_config_var("prefix")
|
|
||||||
@@ -207,13 +206,6 @@ class pil_build_ext(build_ext):
|
|
||||||
if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
|
|
||||||
add_directory(include_dirs, tcl_dir)
|
|
||||||
|
|
||||||
- # standard locations
|
|
||||||
- add_directory(library_dirs, "/usr/local/lib")
|
|
||||||
- add_directory(include_dirs, "/usr/local/include")
|
|
||||||
-
|
|
||||||
- add_directory(library_dirs, "/usr/lib")
|
|
||||||
- add_directory(include_dirs, "/usr/include")
|
|
||||||
-
|
|
||||||
#
|
|
||||||
# insert new dirs *before* default libs, to avoid conflicts
|
|
||||||
# between Python PYD stub libs and real libraries
|
|
||||||
--
|
|
||||||
1.7.2.5
|
|
||||||
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
DESCRIPTION = "Python Imaging Library"
|
|
||||||
SECTION = "devel/python"
|
|
||||||
|
|
||||||
PR = "r1"
|
|
||||||
|
|
||||||
LICENSE = "BSD"
|
|
||||||
LIC_FILES_CHKSUM = "file://README;beginline=92;endline=117;md5=003338c482e1d2eb2e4d862897f3abbf"
|
|
||||||
|
|
||||||
DEPENDS = "freetype jpeg tiff"
|
|
||||||
SRCNAME = "Imaging"
|
|
||||||
|
|
||||||
SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \
|
|
||||||
file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch \
|
|
||||||
"
|
|
||||||
SRC_URI[md5sum] = "fc14a54e1ce02a0225be8854bfba478e"
|
|
||||||
SRC_URI[sha256sum] = "895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/${SRCNAME}-${PV}"
|
|
||||||
|
|
||||||
inherit distutils
|
|
||||||
|
|
||||||
do_compile() {
|
|
||||||
export STAGING_LIBDIR=${STAGING_LIBDIR}
|
|
||||||
export STAGING_INCDIR=${STAGING_INCDIR}
|
|
||||||
distutils_do_compile
|
|
||||||
}
|
|
||||||
|
|
||||||
do_install() {
|
|
||||||
export STAGING_LIBDIR=${STAGING_LIBDIR}
|
|
||||||
export STAGING_INCDIR=${STAGING_INCDIR}
|
|
||||||
distutils_do_install
|
|
||||||
install -d ${D}${datadir}/doc/${PN}/html/
|
|
||||||
install -m 0644 ${S}/README ${D}${datadir}/doc/${PN}/
|
|
||||||
install -m 0644 ${S}/Docs/* ${D}${datadir}/doc/${PN}/html/
|
|
||||||
|
|
||||||
# get rid of #!/usr/local/bin/python
|
|
||||||
sed -i -e 's:/usr/local/bin/:${bindir}/env :g' ${D}${bindir}/*
|
|
||||||
|
|
||||||
}
|
|
||||||
RDEPENDS_${PN} = "python-lang python-stringold"
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user