[PATCHv2] build: make wafsamba CHECK_SIZEOF cross-compile friendly

Andrew Bartlett abartlet at samba.org
Sun Apr 6 18:38:09 MDT 2014


On Tue, 2014-04-01 at 16:25 -0300, Gustavo Zacarias wrote:
> Use the same trick as commit 0d9bb86293c9d39298786df095c73a6251b08b7e
> We do the same array trick iteratively starting from 1 (byte) by powers
> of 2 up to 32.

Can you please confirm that the patches don't break other tests, by
showing a diff of the sorted config.h before and after?

In this case, it would appear to break utmp.

abartlet at ruth:/data/samba/git/samba-push$ sort /tmp/config.h > /tmp/config.h.sorted
abartlet at ruth:/data/samba/git/samba-push$ sort bin/default/include/config.h > /tmp/config.h.sorted-new
abartlet at ruth:/data/samba/git/samba-push$ diff -u /tmp/config.h.sorted /tmp/config.h.sorted-new 
--- /tmp/config.h.sorted	2014-04-07 12:33:27.308605653 +1200
+++ /tmp/config.h.sorted-new	2014-04-07 12:33:42.612251091 +1200
@@ -819,8 +819,6 @@
 #define SIZEOF_UINT32_T 4
 #define SIZEOF_UINT64_T 8
 #define SIZEOF_UINT8_T 1
-#define SIZEOF_UTMP_UT_LINE 32
-#define SIZEOF_VOID_P 8
 #define SOCKET_WRAPPER 1
 #define static_decl_auth extern NTSTATUS auth_sam_init(void); extern NTSTATUS auth_unix_init(void); extern NTSTATUS auth_winbind_init(void); extern NTSTATUS auth_wbc_init(void); extern NTSTATUS auth_domain_init(void); extern NTSTATUS auth_builtin_init(void); extern NTSTATUS auth_samba4_init(void);
 #define static_decl_charset extern NTSTATUS charset_weird_init(void);
@@ -925,7 +923,6 @@
 #define WITH_QUOTAS 1
 #define WITH_SENDFILE 1
 #define WITH_SYSLOG 1
-#define WITH_UTMP 1
 #define WITH_WINBIND 1
 #define WORKING_GETCONF_LFS_CFLAGS 1
 #define _XOPEN_SOURCE_EXTENDED 1
@@ -1061,5 +1058,4 @@
 /* #undef SYSCONF_SC_NPROC_ONLN */
 /* #undef USE_DMAPI */
 /* #undef USE_LINUX_32BIT_SYSCALLS */
-/* #undef WORDS_BIGENDIAN */
 /* #undef XATTR_ADDITIONAL_OPTIONS */

If you could mail back a fixed and current set of patches for all the outstanding cross-compile issues, I'll look at them again.

Thanks,

Andrew Bartlett

-- 
Andrew Bartlett
http://samba.org/~abartlet/
Authentication Developer, Samba Team  http://samba.org
Samba Developer, Catalyst IT          http://catalyst.net.nz/services/samba






More information about the samba-technical mailing list