[gentoo-commits] repo/gentoo:master commit in: sys-libs/tevent/files/, sys-libs/tevent/
commit: d02831a4eede99aa68e1ee7dc73e2e5adbb9a143
Author: Dennis Camera riiengineering ch>
AuthorDate: Wed Mar 27 11:02:13 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 30 06:39:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02831a4
sys-libs/tevent: fix redefinition of uintptr_t in bundled cmocka library
Build failed with musl libc:
In file included from ../../third_party/cmocka/cmocka.c:61:
../../third_party/cmocka/cmocka.h:127:28: error: conflicting types for
'uintptr_t'; have 'unsigned int'
127 | typedef unsigned int uintptr_t;
|^
In file included from /usr/include/stdint.h:20,
from /usr/include/inttypes.h:9,
from ../../third_party/cmocka/cmocka.c:27:
/usr/include/bits/alltypes.h:47:24: note: previous declaration of
'uintptr_t' with type 'uintptr_t' {aka 'long unsigned int'}
47 | typedef unsigned _Addr uintptr_t;
|^
Signed-off-by: Dennis Camera riiengineering.ch>
Signed-off-by: Sam James gentoo.org>
sys-libs/tevent/files/cmocka-config_h.patch | 23 +++
sys-libs/tevent/tevent-0.13.0.ebuild| 4
sys-libs/tevent/tevent-0.14.0.ebuild| 4
sys-libs/tevent/tevent-0.14.1.ebuild| 4
sys-libs/tevent/tevent-0.15.0.ebuild| 4
5 files changed, 39 insertions(+)
diff --git a/sys-libs/tevent/files/cmocka-config_h.patch
b/sys-libs/tevent/files/cmocka-config_h.patch
new file mode 100644
index ..124928450cd6
--- /dev/null
+++ b/sys-libs/tevent/files/cmocka-config_h.patch
@@ -0,0 +1,23 @@
+--- ./third_party/cmocka/cmocka.h.orig 2024-03-26 10:23:03.378410042 +0100
./third_party/cmocka/cmocka.h 2024-03-26 10:24:51.526922405 +0100
+@@ -14,6 +14,11 @@
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #ifndef CMOCKA_H_
+ #define CMOCKA_H_
+
+@@ -111,7 +114,7 @@
+ ((LargestIntegralType)(value))
+
+ /* Smallest integral type capable of holding a pointer. */
+-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
++#if !defined(HAVE_UINTPTR_T) && !defined(_UINTPTR_T) &&
!defined(_UINTPTR_T_DEFINED) && !defined(__DEFINED_uintptr_t)
+ # if defined(_WIN32)
+ /* WIN32 is an ILP32 platform */
+ typedef unsigned int uintptr_t;
diff --git a/sys-libs/tevent/tevent-0.13.0.ebuild
b/sys-libs/tevent/tevent-0.13.0.ebuild
index d13c4c06ea0b..87b2f050f147 100644
--- a/sys-libs/tevent/tevent-0.13.0.ebuild
+++ b/sys-libs/tevent/tevent-0.13.0.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/cmocka-config_h.patch
+)
+
WAF_BINARY="${S}/buildtools/bin/waf"
pkg_setup() {
diff --git a/sys-libs/tevent/tevent-0.14.0.ebuild
b/sys-libs/tevent/tevent-0.14.0.ebuild
index c178820999e5..7757e601adbb 100644
--- a/sys-libs/tevent/tevent-0.14.0.ebuild
+++ b/sys-libs/tevent/tevent-0.14.0.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/cmocka-config_h.patch
+)
+
WAF_BINARY="${S}/buildtools/bin/waf"
check_samba_dep_versions() {
diff --git a/sys-libs/tevent/tevent-0.14.1.ebuild
b/sys-libs/tevent/tevent-0.14.1.ebuild
index 832834917e1d..59e5993d23c2 100644
--- a/sys-libs/tevent/tevent-0.14.1.ebuild
+++ b/sys-libs/tevent/tevent-0.14.1.ebuild
@@ -41,6 +41,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/cmocka-config_h.patch
+)
+
WAF_BINARY="${S}/buildtools/bin/waf"
check_samba_dep_versions() {
diff --git a/sys-libs/tevent/tevent-0.15.0.ebuild
b/sys-libs/tevent/tevent-0.15.0.ebuild
index d5297a130f6f..f59c3edc 100644
--- a/sys-libs/tevent/tevent-0.15.0.ebuild
+++ b/sys-libs/tevent/tevent-0.15.0.ebuild
@@ -41,6 +41,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/cmocka-config_h.patch
+)
+
WAF_BINARY="${S}/buildtools/bin/waf"
check_samba_dep_versions() {
[gentoo-commits] repo/gentoo:master commit in: sys-libs/tevent/files/, sys-libs/tevent/
commit: 5036cd55e8dc0287605350486047b58647b9feeb
Author: David Seifert gentoo org>
AuthorDate: Sun Jan 23 14:26:32 2022 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jan 23 14:26:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5036cd55
sys-libs/tevent: add missing `#include `
Closes: https://bugs.gentoo.org/828720
Signed-off-by: David Seifert gentoo.org>
sys-libs/tevent/files/tevent-0.11.0-missing-include.patch | 13 +
sys-libs/tevent/tevent-0.11.0.ebuild | 2 ++
2 files changed, 15 insertions(+)
diff --git a/sys-libs/tevent/files/tevent-0.11.0-missing-include.patch
b/sys-libs/tevent/files/tevent-0.11.0-missing-include.patch
new file mode 100644
index ..c88550e54e64
--- /dev/null
+++ b/sys-libs/tevent/files/tevent-0.11.0-missing-include.patch
@@ -0,0 +1,13 @@
+pid_t requires
+Bug: https://bugs.gentoo.org/828720
+
+--- a/tevent.h
b/tevent.h
+@@ -31,6 +31,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ /* for old gcc releases that don't have the feature test macro
__has_attribute */
diff --git a/sys-libs/tevent/tevent-0.11.0.ebuild
b/sys-libs/tevent/tevent-0.11.0.ebuild
index 4190931690f9..145c572a0a4b 100644
--- a/sys-libs/tevent/tevent-0.11.0.ebuild
+++ b/sys-libs/tevent/tevent-0.11.0.ebuild
@@ -41,6 +41,8 @@ BDEPEND="${PYTHON_DEPS}
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}"/${P}-missing-include.patch )
+
WAF_BINARY="${S}/buildtools/bin/waf"
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: sys-libs/tevent/files/, sys-libs/tevent/
commit: 216e7ef6531d5fe8c611fa7dae0011f0fc73c906
Author: Ian Stakenvicius gentoo org>
AuthorDate: Fri Aug 11 15:25:52 2017 +
Commit: Ian Stakenvicius gentoo org>
CommitDate: Fri Aug 11 21:23:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216e7ef6
sys-libs/tevent-0.9.33: prevent bundling of talloc
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
sys-libs/tevent/files/talloc-disable-python.patch | 34 +++
sys-libs/tevent/tevent-0.9.33.ebuild | 6
2 files changed, 40 insertions(+)
diff --git a/sys-libs/tevent/files/talloc-disable-python.patch
b/sys-libs/tevent/files/talloc-disable-python.patch
new file mode 100644
index 000..6ef45eb37fb
--- /dev/null
+++ b/sys-libs/tevent/files/talloc-disable-python.patch
@@ -0,0 +1,34 @@
+--- a/lib/talloc/wscript 2017-04-28 04:57:26.0 -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)
+
diff --git a/sys-libs/tevent/tevent-0.9.33.ebuild
b/sys-libs/tevent/tevent-0.9.33.ebuild
index c454b5e965e..fc46807e4d1 100644
--- a/sys-libs/tevent/tevent-0.9.33.ebuild
+++ b/sys-libs/tevent/tevent-0.9.33.ebuild
@@ -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')
}
