Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame^] | 1 | From cd09b6f68aa49c72e9a9bb0765e8c666238a7b7e Mon Sep 17 00:00:00 2001 |
| 2 | From: Leon Anavi <leon.anavi@konsulko.com> |
| 3 | Date: Mon, 11 Jan 2021 13:25:12 +0000 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 4 | Subject: [PATCH] support cross compiling |
| 5 | |
| 6 | Upstream-Status: Inappropriate [oe specific] |
| 7 | |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame^] | 8 | Suggested-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 9 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 10 | --- |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame^] | 11 | setup.py | 6 +++--- |
| 12 | 1 file changed, 3 insertions(+), 3 deletions(-) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 13 | |
| 14 | diff --git a/setup.py b/setup.py |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame^] | 15 | index cbc2641c..302bc6e7 100755 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 16 | --- a/setup.py |
| 17 | +++ b/setup.py |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame^] | 18 | @@ -123,7 +123,7 @@ _LIB_IMAGING = ( |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 19 | "codec_fd", |
| 20 | ) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 21 | |
| 22 | -DEBUG = False |
| 23 | +DEBUG = True |
| 24 | |
| 25 | |
| 26 | class DependencyException(Exception): |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame^] | 27 | @@ -408,12 +408,12 @@ class pil_build_ext(build_ext): |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 28 | _add_directory(library_dirs, match.group(1)) |
| 29 | |
| 30 | # include, rpath, if set as environment variables: |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 31 | - for k in ("C_INCLUDE_PATH", "CPATH", "INCLUDE"): |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame^] | 32 | + for k in ("C_INCLUDE_PATH", "CPATH", "INCLUDE", "STAGING_INCDIR"): |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 33 | if k in os.environ: |
| 34 | for d in os.environ[k].split(os.path.pathsep): |
| 35 | _add_directory(include_dirs, d) |
| 36 | |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 37 | - for k in ("LD_RUN_PATH", "LIBRARY_PATH", "LIB"): |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame^] | 38 | + for k in ("LD_RUN_PATH", "LIBRARY_PATH", "LIB", "STAGING_LIBDIR"): |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 39 | if k in os.environ: |
| 40 | for d in os.environ[k].split(os.path.pathsep): |
| 41 | _add_directory(library_dirs, d) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 42 | -- |
Andrew Geissler | eef6386 | 2021-01-29 15:58:13 -0600 | [diff] [blame^] | 43 | 2.17.1 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 44 | |