| 1 |
commit: af6790d9b83c1bf18bd6adaa32b6a2b68b1a524f |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 28 19:35:06 2022 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 29 18:12:51 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6790d9 |
| 7 |
|
| 8 |
sys-libs/ldb: fix tevent detection |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/590026 |
| 11 |
|
| 12 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch | 12 ++++++++++++ |
| 15 |
sys-libs/ldb/ldb-2.3.4.ebuild | 1 + |
| 16 |
sys-libs/ldb/ldb-2.4.4.ebuild | 1 + |
| 17 |
sys-libs/ldb/ldb-2.5.2.ebuild | 1 + |
| 18 |
4 files changed, 15 insertions(+) |
| 19 |
|
| 20 |
diff --git a/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch b/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch |
| 21 |
new file mode 100644 |
| 22 |
index 000000000000..4578435064b0 |
| 23 |
--- /dev/null |
| 24 |
+++ b/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch |
| 25 |
@@ -0,0 +1,12 @@ |
| 26 |
+--- ldb-1.3.6/lib/tevent/wscript |
| 27 |
++++ ldb-1.3.6/lib/tevent/wscript |
| 28 |
+@@ -34,8 +34,7 @@ |
| 29 |
+ if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION, |
| 30 |
+ onlyif='talloc', implied_deps='replace talloc'): |
| 31 |
+ conf.define('USING_SYSTEM_TEVENT', 1) |
| 32 |
+- if not conf.env.disable_python and \ |
| 33 |
+- conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION): |
| 34 |
++ if not conf.env.disable_python: |
| 35 |
+ conf.define('USING_SYSTEM_PYTEVENT', 1) |
| 36 |
+ |
| 37 |
+ if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'): |
| 38 |
|
| 39 |
diff --git a/sys-libs/ldb/ldb-2.3.4.ebuild b/sys-libs/ldb/ldb-2.3.4.ebuild |
| 40 |
index 85ca63eb5be2..0730a2c090be 100644 |
| 41 |
--- a/sys-libs/ldb/ldb-2.3.4.ebuild |
| 42 |
+++ b/sys-libs/ldb/ldb-2.3.4.ebuild |
| 43 |
@@ -53,6 +53,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) |
| 44 |
PATCHES=( |
| 45 |
"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch |
| 46 |
"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch |
| 47 |
+ "${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch |
| 48 |
) |
| 49 |
|
| 50 |
pkg_setup() { |
| 51 |
|
| 52 |
diff --git a/sys-libs/ldb/ldb-2.4.4.ebuild b/sys-libs/ldb/ldb-2.4.4.ebuild |
| 53 |
index 54d9456e59cd..05b4d0c727a9 100644 |
| 54 |
--- a/sys-libs/ldb/ldb-2.4.4.ebuild |
| 55 |
+++ b/sys-libs/ldb/ldb-2.4.4.ebuild |
| 56 |
@@ -54,6 +54,7 @@ PATCHES=( |
| 57 |
"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch |
| 58 |
"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch |
| 59 |
"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch |
| 60 |
+ "${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch |
| 61 |
) |
| 62 |
|
| 63 |
pkg_setup() { |
| 64 |
|
| 65 |
diff --git a/sys-libs/ldb/ldb-2.5.2.ebuild b/sys-libs/ldb/ldb-2.5.2.ebuild |
| 66 |
index bfd7de97a612..c723951c9d16 100644 |
| 67 |
--- a/sys-libs/ldb/ldb-2.5.2.ebuild |
| 68 |
+++ b/sys-libs/ldb/ldb-2.5.2.ebuild |
| 69 |
@@ -54,6 +54,7 @@ PATCHES=( |
| 70 |
"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch |
| 71 |
"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch |
| 72 |
"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch |
| 73 |
+ "${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch |
| 74 |
) |
| 75 |
|
| 76 |
pkg_setup() { |
Archives