diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /dev-python/pillow/files | |
parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) |
gentoo resync : 12.01.2019
Diffstat (limited to 'dev-python/pillow/files')
-rw-r--r-- | dev-python/pillow/files/pillow-5.4.1-pkg-config.patch | 28 | ||||
-rw-r--r-- | dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch | 12 |
2 files changed, 40 insertions, 0 deletions
diff --git a/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch b/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch new file mode 100644 index 000000000000..ec227b3f80a7 --- /dev/null +++ b/dev-python/pillow/files/pillow-5.4.1-pkg-config.patch @@ -0,0 +1,28 @@ +diff -Naur a/setup.py b/setup.py +--- a/setup.py 2019-01-06 12:12:16.000000000 +0000 ++++ b/setup.py 2019-01-08 23:04:45.574698210 +0000 +@@ -197,12 +197,13 @@ + + def _pkg_config(name): + try: ++ command = os.environ.get('PKG_CONFIG', 'pkg-config') + command_libs = [ +- 'pkg-config', ++ command, + '--libs-only-L', name, + ] + command_cflags = [ +- 'pkg-config', ++ command, + '--cflags-only-I', name, + ] + if not DEBUG: +@@ -298,7 +299,7 @@ + _add_directory(include_dirs, "src/libImaging") + + pkg_config = None +- if _cmd_exists('pkg-config'): ++ if _cmd_exists(os.environ.get('PKG_CONFIG', 'pkg-config')): + pkg_config = _pkg_config + + # diff --git a/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch b/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch new file mode 100644 index 000000000000..d3e95eef5164 --- /dev/null +++ b/dev-python/pillow/files/pillow-5.4.1-toolchain-paths.patch @@ -0,0 +1,12 @@ +diff -Naur a/setup.py b/setup.py +--- a/setup.py 2019-01-08 23:06:33.082873069 +0000 ++++ b/setup.py 2019-01-08 23:06:47.707165225 +0000 +@@ -356,7 +356,7 @@ + for d in os.environ[k].split(os.path.pathsep): + _add_directory(library_dirs, d) + +- prefix = sysconfig.get_config_var("prefix") ++ prefix = None + if prefix: + _add_directory(library_dirs, os.path.join(prefix, "lib")) + _add_directory(include_dirs, os.path.join(prefix, "include")) |