gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-libs/tevent-0.9.33: prevent bundling of talloc

Browse Source 
If sys-libs/talloc is too old or is missing, tevent would build its
own bundled copy.  This commit prevents that from happening, causing
a configuration error instead.

This commit also addresses the configuration issue that hard requires
pytalloc-util even when python is disabled (which was buried behind
the bundling issue)

Package-Manager: Portage-2.3.6, Repoman-2.3.1
This commit is contained in:
Ian Stakenvicius
2017-08-11 11:25:52 -04:00
parent 99ba4dbeb1
commit 216e7ef653
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sys-libs/tevent/files/talloc-disable-python.patch Normal file
View File

@@ -0,0 +1,34 @@
--- 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)

6
sys-libs/tevent/tevent-0.9.33.ebuild
View File

@@ -26,6 +26,10 @@ DEPEND="${RDEPEND}
# build system does not work with python3
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
PATCHES=(
"${FILESDIR}"/talloc-disable-python.patch
)
WAF_BINARY="${S}/buildtools/bin/waf"
pkg_setup() {
@@ -39,6 +43,8 @@ src_prepare() {
multilib_src_configure() {
waf-utils_src_configure \
--bundled-libraries=NONE \
--builtin-libraries=NONE \
$(multilib_native_usex python '' '--disable-python')
}