package/samba4: fix uclibc build with openldap
PATCH 1/1 package/samba4: fix uclibc build with openldap
Fixes:
- http://autobuild.buildroot.org/results/09e84d15efe755bdefa9f8c6b8355c49ddbc2f65
--- ...st.c-include-stdint.h-before-cmoka.h.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/samba4/0004-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch
package/samba4/0004-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch new file +40 -0
@@ -0,0 +1,40 @@ +From b2ea5dc3639d68b878c6534f4992da446dbbf2d4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sat, 16 May 2020 18:15:38 +0200 +Subject: [PATCH] ldap_message_test.c: include stdint.h before cmoka.h + +This fix the following build failure on uclibc: + +In file included from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/lib/gcc/mips64el-buildroot-linux-uclibc/5.5.0/include/stdint.h:9:0, + from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/inttypes.h:27, + from ../../lib/replace/../replace/replace.h:64, + from ../../source4/include/includes.h:23, + from ../../libcli/ldap/tests/ldap_message_test.c:41: +/home/giuliobenetti/autobuild/run/instance-1/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27: error: conflicting types for 'uintptr_t' + typedef unsigned long int uintptr_t; + ^ + +Fixes: + - http://autobuild.buildroot.org/results/09e84d15efe755bdefa9f8c6b8355c49ddbc2f65 + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: not sent yet] +--- + libcli/ldap/tests/ldap_message_test.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libcli/ldap/tests/ldap_message_test.c b/libcli/ldap/tests/ldap_message_test.c +index c5aacd4bc6b..51331e5c600 100644 +--- a/libcli/ldap/tests/ldap_message_test.c ++++ b/libcli/ldap/tests/ldap_message_test.c +@@ -34,6 +34,7 @@ + */ + #include <stdarg.h> + #include <stddef.h> ++#include <stdint.h> + #include <setjmp.h> + #include <cmocka.h> + +-- +2.26.2 +
Signature · 1 line
2.26.2
PATCH 1/1 package/samba4: fix uclibc build with openldap
Quoted 8 lines · On Sat, 16 May 2020 18:27:31 +0200 Fabrice Fontaine…
Fixes:
- http://autobuild.buildroot.org/results/09e84d15efe755bdefa9f8c6b8355c49ddbc2f65Signed-off-by Fabrice Fontaine <[email protected]>--- ...st.c-include-stdint.h-before-cmoka.h.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/samba4/0004-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch
Applied to master, thanks. Could you submit the patch upstream? A similar issue was reported at
https://gitlab.com/cmocka/cmocka/-/issues/7 and fixed in
https://gitlab.com/cmocka/cmocka/-/commit/dd8449ae3ba7fd05ac172f0227cd93af7f37005e.
I looked briefly, and the problem is that cmocka.h wants to define its own uintptr_t, and it does it in a way that is broken for mips64. As explained in the bug report, cmocka.h should probably not try to define its own uintptr_t, and should instead always rely on the one provided by stdint.h.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/samba4: fix uclibc build with openldap
In reply to Fabrice FontaineQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Fixes:
- http://autobuild.buildroot.org/results/09e84d15efe755bdefa9f8c6b8355c49ddbc2f65Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard