mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-31 21:18:09 -07:00
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
--- a/lib/talloc/wscript 2017-04-28 04:57:26.000000000 -0400
|
|
+++ b/lib/talloc/wscript 2017-07-05 14:30:42.700580464 -0400
|
|
@@ -74,19 +74,22 @@
|
|
implied_deps='replace'):
|
|
conf.define('USING_SYSTEM_TALLOC', 1)
|
|
|
|
- using_system_pytalloc_util = True
|
|
- if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
|
|
- implied_deps='talloc replace'):
|
|
+ if conf.env.disable_python:
|
|
using_system_pytalloc_util = False
|
|
-
|
|
- # We need to get a pytalloc-util for all the python versions
|
|
- # we are building for
|
|
- if conf.env['EXTRA_PYTHON']:
|
|
- name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
|
|
- if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
|
|
+ else:
|
|
+ using_system_pytalloc_util = True
|
|
+ if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION,
|
|
implied_deps='talloc replace'):
|
|
using_system_pytalloc_util = False
|
|
|
|
+ # We need to get a pytalloc-util for all the python versions
|
|
+ # we are building for
|
|
+ if conf.env['EXTRA_PYTHON']:
|
|
+ name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG']
|
|
+ if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION,
|
|
+ implied_deps='talloc replace'):
|
|
+ using_system_pytalloc_util = False
|
|
+
|
|
if using_system_pytalloc_util:
|
|
conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
|
|
|