diff options
Diffstat (limited to 'meta-python')
-rw-r--r-- | meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch | 25 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python-imaging_1.1.7.bb | 3 |
2 files changed, 27 insertions, 1 deletions
diff --git a/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch b/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch new file mode 100644 index 000000000..028a51ad5 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Avoid getting host sysroot paths in the library paths to fix issue like: | ||
2 | |||
3 | | /home/andrei/work/yocto/build-rpi-master/tmp/sysroots/x86_64-linux/usr/lib/libz.so: file not recognized: File format not recognized | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
8 | |||
9 | |||
10 | Index: Imaging-1.1.7/setup.py | ||
11 | =================================================================== | ||
12 | --- Imaging-1.1.7.orig/setup.py | ||
13 | +++ Imaging-1.1.7/setup.py | ||
14 | @@ -155,11 +155,6 @@ class pil_build_ext(build_ext): | ||
15 | |||
16 | # FIXME: check /opt/stuff directories here? | ||
17 | |||
18 | - prefix = sysconfig.get_config_var("prefix") | ||
19 | - if prefix: | ||
20 | - add_directory(library_dirs, os.path.join(prefix, "lib")) | ||
21 | - add_directory(include_dirs, os.path.join(prefix, "include")) | ||
22 | - | ||
23 | # | ||
24 | # locate tkinter libraries | ||
25 | |||
diff --git a/meta-python/recipes-devtools/python/python-imaging_1.1.7.bb b/meta-python/recipes-devtools/python/python-imaging_1.1.7.bb index a67832827..d2f1a8c0b 100644 --- a/meta-python/recipes-devtools/python/python-imaging_1.1.7.bb +++ b/meta-python/recipes-devtools/python/python-imaging_1.1.7.bb | |||
@@ -9,7 +9,8 @@ PR = "r5" | |||
9 | SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ | 9 | SRC_URI = "http://effbot.org/downloads/Imaging-${PV}.tar.gz \ |
10 | file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch \ | 10 | file://0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch \ |
11 | file://allow.to.disable.some.features.patch \ | 11 | file://allow.to.disable.some.features.patch \ |
12 | file://fix-freetype-includes.patch" | 12 | file://fix-freetype-includes.patch \ |
13 | file://remove-host-libdir.patch" | ||
13 | 14 | ||
14 | SRC_URI[md5sum] = "fc14a54e1ce02a0225be8854bfba478e" | 15 | SRC_URI[md5sum] = "fc14a54e1ce02a0225be8854bfba478e" |
15 | SRC_URI[sha256sum] = "895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211" | 16 | SRC_URI[sha256sum] = "895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211" |