646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
17 lines
636 B
Diff
17 lines
636 B
Diff
Resolve messy situation with uintptr_t and stdint.h
|
|
|
|
Platforms common in nixpkgs will have stdint.h - thereby we avoid problems
|
|
that seem complicated to avoid. References:
|
|
https://gitlab.com/cmocka/cmocka/-/issues/38#note_1286565655
|
|
https://git.alpinelinux.org/aports/plain/main/cmocka/musl_uintptr.patch?id=6a15dd0d0ba9cc354a621fb359ca5e315ff2eabd
|
|
|
|
It isn't easy, as 1.1.6 codebase is missing stdint.h includes on many places,
|
|
and HAVE_UINTPTR_T from cmake also wouldn't get on all places it needs to.
|
|
--- a/include/cmocka.h
|
|
+++ b/include/cmocka.h
|
|
@@ -18,2 +18,4 @@
|
|
#define CMOCKA_H_
|
|
+#include <stdint.h>
|
|
+#define HAVE_UINTPTR_T 1
|
|
|