diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 15:28:33 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 19:31:28 +0000 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-python/recipes-devtools/python/python3-pillow | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.gz talos-openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.zip |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-pillow')
2 files changed, 100 insertions, 0 deletions
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch new file mode 100644 index 000000000..de89ba005 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-explicitly-set-compile-options.patch @@ -0,0 +1,39 @@ +From 52879439f2976662140b76951f43f16e1d5ef08e Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 18 Mar 2019 23:23:55 -0400 +Subject: [PATCH] explicitly set compile options + +OE does not support to install egg package, so +explicitly set build_ext options for oe-core's +`setup.py install' + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + setup.cfg | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/setup.cfg b/setup.cfg +index 95900ff..27da313 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -9,3 +9,15 @@ addopts = -vx Tests + + [flake8] + max-line-length = 88 ++ ++[build_ext] ++disable-platform-guessing = 1 ++enable-zlib = 1 ++enable-jpeg = 1 ++enable-tiff = 1 ++enable-freetype = 1 ++enable-lcms = 1 ++enable-jpeg2000 = 1 ++disable-webp = 1 ++disable-webpmux = 1 ++disable-imagequant = 1 +-- +2.8.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch new file mode 100644 index 000000000..e86293421 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch @@ -0,0 +1,61 @@ +From a78411402c824668283beb94db4bf7e206a4cf60 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 14 Mar 2019 03:48:10 -0400 +Subject: [PATCH] support cross compiling + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + setup.py | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +diff --git a/setup.py b/setup.py +index 79f912b..37e5827 100755 +--- a/setup.py ++++ b/setup.py +@@ -50,7 +50,7 @@ _LIB_IMAGING = ( + "ZipEncode", "TiffDecode", "Jpeg2KDecode", "Jpeg2KEncode", "BoxBlur", + "QuantPngQuant", "codec_fd") + +-DEBUG = False ++DEBUG = True + + + class DependencyException(Exception): +@@ -345,21 +345,16 @@ class pil_build_ext(build_ext): + _add_directory(library_dirs, match.group(1)) + + # include, rpath, if set as environment variables: +- for k in ('C_INCLUDE_PATH', 'CPATH', 'INCLUDE'): ++ for k in ('C_INCLUDE_PATH', 'CPATH', 'INCLUDE', 'STAGING_INCDIR'): + if k in os.environ: + for d in os.environ[k].split(os.path.pathsep): + _add_directory(include_dirs, d) + +- for k in ('LD_RUN_PATH', 'LIBRARY_PATH', 'LIB'): ++ for k in ('LD_RUN_PATH', 'LIBRARY_PATH', 'LIB', 'STAGING_LIBDIR'): + if k in os.environ: + for d in os.environ[k].split(os.path.pathsep): + _add_directory(library_dirs, d) + +- prefix = sysconfig.get_config_var("prefix") +- if prefix: +- _add_directory(library_dirs, os.path.join(prefix, "lib")) +- _add_directory(include_dirs, os.path.join(prefix, "include")) +- + # + # add platform directories + +@@ -413,8 +408,6 @@ class pil_build_ext(build_ext): + elif sys.platform.startswith("linux") or \ + sys.platform.startswith("gnu") or \ + sys.platform.startswith("freebsd"): +- for dirname in _find_library_dirs_ldconfig(): +- _add_directory(library_dirs, dirname) + if sys.platform.startswith("linux") and \ + os.environ.get('ANDROID_ROOT', None): + # termux support for android. +-- +2.8.1 + |