| 1 |
commit: 216e7ef6531d5fe8c611fa7dae0011f0fc73c906 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 11 15:25:52 2017 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 11 21:23:02 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216e7ef6 |
| 7 |
|
| 8 |
sys-libs/tevent-0.9.33: prevent bundling of talloc |
| 9 |
|
| 10 |
If sys-libs/talloc is too old or is missing, tevent would build its |
| 11 |
own bundled copy. This commit prevents that from happening, causing |
| 12 |
a configuration error instead. |
| 13 |
|
| 14 |
This commit also addresses the configuration issue that hard requires |
| 15 |
pytalloc-util even when python is disabled (which was buried behind |
| 16 |
the bundling issue) |
| 17 |
|
| 18 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 19 |
|
| 20 |
sys-libs/tevent/files/talloc-disable-python.patch | 34 +++++++++++++++++++++++ |
| 21 |
sys-libs/tevent/tevent-0.9.33.ebuild | 6 ++++ |
| 22 |
2 files changed, 40 insertions(+) |
| 23 |
|
| 24 |
diff --git a/sys-libs/tevent/files/talloc-disable-python.patch b/sys-libs/tevent/files/talloc-disable-python.patch |
| 25 |
new file mode 100644 |
| 26 |
index 00000000000..6ef45eb37fb |
| 27 |
--- /dev/null |
| 28 |
+++ b/sys-libs/tevent/files/talloc-disable-python.patch |
| 29 |
@@ -0,0 +1,34 @@ |
| 30 |
+--- a/lib/talloc/wscript 2017-04-28 04:57:26.000000000 -0400 |
| 31 |
++++ b/lib/talloc/wscript 2017-07-05 14:30:42.700580464 -0400 |
| 32 |
+@@ -74,19 +74,22 @@ |
| 33 |
+ implied_deps='replace'): |
| 34 |
+ conf.define('USING_SYSTEM_TALLOC', 1) |
| 35 |
+ |
| 36 |
+- using_system_pytalloc_util = True |
| 37 |
+- if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, |
| 38 |
+- implied_deps='talloc replace'): |
| 39 |
++ if conf.env.disable_python: |
| 40 |
+ using_system_pytalloc_util = False |
| 41 |
+- |
| 42 |
+- # We need to get a pytalloc-util for all the python versions |
| 43 |
+- # we are building for |
| 44 |
+- if conf.env['EXTRA_PYTHON']: |
| 45 |
+- name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] |
| 46 |
+- if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, |
| 47 |
++ else: |
| 48 |
++ using_system_pytalloc_util = True |
| 49 |
++ if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, |
| 50 |
+ implied_deps='talloc replace'): |
| 51 |
+ using_system_pytalloc_util = False |
| 52 |
+ |
| 53 |
++ # We need to get a pytalloc-util for all the python versions |
| 54 |
++ # we are building for |
| 55 |
++ if conf.env['EXTRA_PYTHON']: |
| 56 |
++ name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] |
| 57 |
++ if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, |
| 58 |
++ implied_deps='talloc replace'): |
| 59 |
++ using_system_pytalloc_util = False |
| 60 |
++ |
| 61 |
+ if using_system_pytalloc_util: |
| 62 |
+ conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) |
| 63 |
+ |
| 64 |
|
| 65 |
diff --git a/sys-libs/tevent/tevent-0.9.33.ebuild b/sys-libs/tevent/tevent-0.9.33.ebuild |
| 66 |
index c454b5e965e..fc46807e4d1 100644 |
| 67 |
--- a/sys-libs/tevent/tevent-0.9.33.ebuild |
| 68 |
+++ b/sys-libs/tevent/tevent-0.9.33.ebuild |
| 69 |
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND} |
| 70 |
# build system does not work with python3 |
| 71 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 72 |
|
| 73 |
+PATCHES=( |
| 74 |
+ "${FILESDIR}"/talloc-disable-python.patch |
| 75 |
+) |
| 76 |
+ |
| 77 |
WAF_BINARY="${S}/buildtools/bin/waf" |
| 78 |
|
| 79 |
pkg_setup() { |
| 80 |
@@ -39,6 +43,8 @@ src_prepare() { |
| 81 |
|
| 82 |
multilib_src_configure() { |
| 83 |
waf-utils_src_configure \ |
| 84 |
+ --bundled-libraries=NONE \ |
| 85 |
+ --builtin-libraries=NONE \ |
| 86 |
$(multilib_native_usex python '' '--disable-python') |
| 87 |
} |
Archives