sys-libs/ldb: fix redefinition of uintptr_t in bundled cmocka library

Build failed with musl libc:

    In file included from ../../tests/test_tevent_tag.c:34:
    ../../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 ../../tests/test_tevent_tag.c:29:
    /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 <dennis.camera+gentoo@riiengineering.ch>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Dennis Camera
2024-03-27 12:06:54 +01:00
committed by Sam James
parent d02831a4ee
commit ae4f92a526
4 changed files with 26 additions and 0 deletions

View File

@@ -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;

View File

@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
"${FILESDIR}"/cmocka-config_h.patch
)
pkg_setup() {

View File

@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
"${FILESDIR}"/cmocka-config_h.patch
)
pkg_setup() {

View File

@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
"${FILESDIR}"/cmocka-config_h.patch
)
pkg_setup() {