Use #error and #warning directives to fail or warn accordingly when
compiling it.
-Status: upstream for next branch.
+Status: Upstream.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
--- /dev/null
+From 8dc24d4006a2e936baf73e116129d2b0a5d71ed7 Mon Sep 17 00:00:00 2001
+From: "Jose A. Rivera" <jarrpa@redhat.com>
+Date: Mon, 5 May 2014 07:29:57 -0500
+Subject: [PATCH] Minor typo fix in source3/wscript.
+
+Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
+Reviewed-by: Volker Lendecke <vl@samba.org>
+Reviewed-by: Jeremy Allison <jra@samba.org>
+
+Autobuild-User(master): Jeremy Allison <jra@samba.org>
+Autobuild-Date(master): Mon May 5 22:41:19 CEST 2014 on sn-devel-104
+
+Status: Upstream.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ source3/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/wscript b/source3/wscript
+index 4fe49fa..8cbd9bc 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -475,7 +475,7 @@ return acl_get_perm_np(permset_d, perm);
+
+ conf.CHECK_CODE('struct statfs fsd; fsid_t fsid = fsd.f_fsid; return statfs(".", &fsd);',
+ 'HAVE_STATFS_F_FSID',
+- msg="vfs_fileid: checking for statfs() and struct statfs.f_fsid",
++ msg="vfs_fileid checking for statfs() and struct statfs.f_fsid",
+ headers='sys/types.h sys/statfs.h',
+ execute=True)
+
+--
+1.8.5.5
+
+++ /dev/null
-From 5e0bafd6504916dd7de5b1ae90e7253d11498435 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Mon, 20 Jan 2014 10:17:19 -0300
-Subject: [PATCH 1/5] build: don't execute statfs and f_fsid checks
-
-There's no need to execute the statfs and statfs.f_fsid checks, the
-return value is of no consequence since it's undefined in some
-platforms and prevents cross-compiling.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- source3/wscript | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/source3/wscript b/source3/wscript
-index 4fe49fa..e81a47b 100644
---- a/source3/wscript
-+++ b/source3/wscript
-@@ -476,8 +476,7 @@ return acl_get_perm_np(permset_d, perm);
- conf.CHECK_CODE('struct statfs fsd; fsid_t fsid = fsd.f_fsid; return statfs(".", &fsd);',
- 'HAVE_STATFS_F_FSID',
- msg="vfs_fileid: checking for statfs() and struct statfs.f_fsid",
-- headers='sys/types.h sys/statfs.h',
-- execute=True)
-+ headers='sys/types.h sys/statfs.h')
-
- if conf.CONFIG_SET('HAVE_FALLOCATE'):
- conf.CHECK_CODE('''
---
-1.8.3.2
-
If it's false it gives array[(-1 * 1)] thus failing with a
negative-sized array.
-Status: upstream for next branch.
+Status: Upstream.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
in order to aid cross-compiling.
According to testing python_LDFLAGS and python_LIBDIR should be enough.
-Status: upstream for next branch.
+Status: Upstream.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
--- /dev/null
+From 934f8c8e9439de4f15b2e61016d5d29233d8d5fa Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Wed, 16 Apr 2014 08:01:36 -0300
+Subject: [PATCH 5/5] build: find blkcnt_t size via array
+
+Using the same trick as commit 0d9bb86293c9d39298786df095c73a6251b08b7e
+find blkcnt_t size via an array so that it can be determined via build
+rather than running it.
+
+Status: Upstream.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ source3/wscript | 22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/source3/wscript b/source3/wscript
+index aade503..6a5728f 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -277,18 +277,20 @@ int main(int argc, char **argv)
+ headers='sys/types.h sys/stat.h unistd.h')
+
+ if "HAVE_BLKCNT_T" in conf.env:
+- conf.CHECK_CODE('''
+- return sizeof(blkcnt_t) == 4 ? 0 : 1''',
+- 'SIZEOF_BLKCNT_T_4', execute=True,
+- headers='replace.h sys/types.h sys/stat.h unistd.h',
+- msg="Checking whether blkcnt_t is 32 bit")
++ conf.CHECK_CODE('''
++ static int test_array[1 - 2 * !(((long int)(sizeof(blkcnt_t))) <= 4)];''',
++ 'SIZEOF_BLKCNT_T_4',
++ headers='replace.h sys/types.h sys/stat.h unistd.h',
++ msg="Checking whether blkcnt_t is 32 bit")
+
++ # If sizeof is 4 it can't be 8
+ if "HAVE_BLKCNT_T" in conf.env:
+- conf.CHECK_CODE('''
+- return sizeof(blkcnt_t) == 8 ? 0 : 1''',
+- 'SIZEOF_BLKCNT_T_8', execute=True,
+- headers='replace.h sys/types.h sys/stat.h unistd.h',
+- msg="Checking whether blkcnt_t is 64 bit")
++ if not conf.CONFIG_SET('SIZEOF_BLKCNT_T_4'):
++ conf.CHECK_CODE('''
++ static int test_array[1 - 2 * !(((long int)(sizeof(blkcnt_t))) <= 8)];''',
++ 'SIZEOF_BLKCNT_T_8',
++ headers='replace.h sys/types.h sys/stat.h unistd.h',
++ msg="Checking whether blkcnt_t is 64 bit")
+
+ # Check for POSIX capability support
+ conf.CHECK_FUNCS_IN('cap_get_proc', 'cap', headers='sys/capability.h')
+--
+1.8.3.2
+
+++ /dev/null
-Force external asn1_compile and compile_et binaries.
-At the moment the samba bundled heimdal fails to build the tools for the host
-when cross-compiling, and it can't link to an external heimdal either.
-
-Status: working with samba upstream on a proper way to cross-compile
-the bundled heimdal.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura samba-4.1.3.orig/source4/heimdal_build/wscript_build samba-4.1.3.heimdal.cross/source4/heimdal_build/wscript_build
---- samba-4.1.3.orig/source4/heimdal_build/wscript_build 2013-12-12 16:45:46.951965484 -0300
-+++ samba-4.1.3.heimdal.cross/source4/heimdal_build/wscript_build 2013-12-18 22:01:24.323429945 -0300
-@@ -925,6 +925,8 @@
- install=False
- )
- bld.env['ASN1_COMPILE'] = os.path.join(bld.env['BUILD_DIRECTORY'], 'asn1_compile')
-+else:
-+ bld.env['ASN1_COMPILE'] = 'asn1_compile'
-
-
- if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
-@@ -939,6 +941,8 @@
- install=False
- )
- bld.env['COMPILE_ET'] = os.path.join(bld.env['BUILD_DIRECTORY'], 'compile_et')
-+else:
-+ bld.env['COMPILE_ET'] = 'compile_et'
-
- HEIMDAL_BINARY('samba4kinit',
- 'kuser/kinit.c',
-diff -Nura samba-4.1.3.orig/source4/heimdal_build/wscript_configure samba-4.1.3.heimdal.cross/source4/heimdal_build/wscript_configure
---- samba-4.1.3.orig/source4/heimdal_build/wscript_configure 2013-12-12 16:45:46.951965484 -0300
-+++ samba-4.1.3.heimdal.cross/source4/heimdal_build/wscript_configure 2013-12-18 21:55:08.813653187 -0300
-@@ -162,6 +162,8 @@
- conf.define('HAVE_KRB5_PRINCIPAL_GET_NUM_COMP', 1)
- conf.define('HAVE_GSSAPI_GSSAPI_SPNEGO_H', 1)
- conf.define('HAVE_FLAGS_IN_KRB5_CREDS', 1)
-+conf.define('USING_SYSTEM_ASN1_COMPILE', 1)
-+conf.define('USING_SYSTEM_COMPILE_ET', 1)
-
- heimdal_includedirs = []
- heimdal_libdirs = []
--- /dev/null
+From ee4e06b7223fb2925bc887c89216a66029d44862 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 1 Apr 2014 06:41:47 -0300
+Subject: [PATCH 2/5] build: unify and fix endian tests
+
+Unify the endian tests out of lib/ccan/wscript into wafsamba since
+they're almost cross-compile friendly.
+While at it fix them to be so by moving the preprocessor directives out
+of main scope since that will fail.
+And keep the WORDS_BIGENDIAN, HAVE_LITTLE_ENDIAN and HAVE_BIG_ENDIAN
+defines separate because of different codebases.
+
+Status: Upstream.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ buildtools/wafsamba/wscript | 65 ++++++++++++++++++++++++++++++++++++++++++---
+ lib/ccan/wscript | 55 --------------------------------------
+ 2 files changed, 62 insertions(+), 58 deletions(-)
+
+diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
+index 7984227..1a2cfe6 100755
+--- a/buildtools/wafsamba/wscript
++++ b/buildtools/wafsamba/wscript
+@@ -390,9 +390,68 @@ def configure(conf):
+ else:
+ conf.define('SHLIBEXT', "so", quote=True)
+
+- conf.CHECK_CODE('long one = 1; return ((char *)(&one))[0]',
+- execute=True,
+- define='WORDS_BIGENDIAN')
++ # First try a header check for cross-compile friendlyness
++ conf.CHECK_CODE(code = """#ifdef __BYTE_ORDER
++ #define B __BYTE_ORDER
++ #elif defined(BYTE_ORDER)
++ #define B BYTE_ORDER
++ #endif
++
++ #ifdef __LITTLE_ENDIAN
++ #define LITTLE __LITTLE_ENDIAN
++ #elif defined(LITTLE_ENDIAN)
++ #define LITTLE LITTLE_ENDIAN
++ #endif
++
++ #if !defined(LITTLE) || !defined(B) || LITTLE != B
++ #error Not little endian.
++ #endif
++ int main(void) { return 0; }""",
++ addmain=False,
++ headers="endian.h sys/endian.h",
++ define="HAVE_LITTLE_ENDIAN")
++ conf.CHECK_CODE(code = """#ifdef __BYTE_ORDER
++ #define B __BYTE_ORDER
++ #elif defined(BYTE_ORDER)
++ #define B BYTE_ORDER
++ #endif
++
++ #ifdef __BIG_ENDIAN
++ #define BIG __BIG_ENDIAN
++ #elif defined(BIG_ENDIAN)
++ #define BIG BIG_ENDIAN
++ #endif
++
++ #if !defined(BIG) || !defined(B) || BIG != B
++ #error Not big endian.
++ #endif
++ int main(void) { return 0; }""",
++ addmain=False,
++ headers="endian.h sys/endian.h",
++ define="HAVE_BIG_ENDIAN")
++
++ if not conf.CONFIG_SET("HAVE_BIG_ENDIAN") and not conf.CONFIG_SET("HAVE_LITTLE_ENDIAN"):
++ # That didn't work! Do runtime test.
++ conf.CHECK_CODE("""union { int i; char c[sizeof(int)]; } u;
++ u.i = 0x01020304;
++ return u.c[0] == 0x04 && u.c[1] == 0x03 && u.c[2] == 0x02 && u.c[3] == 0x01 ? 0 : 1;""",
++ addmain=True, execute=True,
++ define='HAVE_LITTLE_ENDIAN',
++ msg="Checking for HAVE_LITTLE_ENDIAN - runtime")
++ conf.CHECK_CODE("""union { int i; char c[sizeof(int)]; } u;
++ u.i = 0x01020304;
++ return u.c[0] == 0x01 && u.c[1] == 0x02 && u.c[2] == 0x03 && u.c[3] == 0x04 ? 0 : 1;""",
++ addmain=True, execute=True,
++ define='HAVE_BIG_ENDIAN',
++ msg="Checking for HAVE_BIG_ENDIAN - runtime")
++
++ # Extra sanity check.
++ if conf.CONFIG_SET("HAVE_BIG_ENDIAN") == conf.CONFIG_SET("HAVE_LITTLE_ENDIAN"):
++ Logs.error("Failed endian determination. The PDP-11 is back?")
++ sys.exit(1)
++ else:
++ if conf.CONFIG_SET("HAVE_BIG_ENDIAN"):
++ conf.DEFINE('WORDS_BIGENDIAN', 1)
+
+ # check if signal() takes a void function
+ if conf.CHECK_CODE('return *(signal (0, 0)) (0) == 1',
+diff --git a/lib/ccan/wscript b/lib/ccan/wscript
+index 1c5f337..0e540db 100644
+--- a/lib/ccan/wscript
++++ b/lib/ccan/wscript
+@@ -25,61 +25,6 @@ def configure(conf):
+ conf.CHECK_CODE('int __attribute__((used)) func(int x) { return x; }',
+ addmain=False, link=False, cflags=conf.env['WERROR_CFLAGS'],
+ define='HAVE_ATTRIBUTE_USED')
+- # We try to use headers for a compile-time test.
+- conf.CHECK_CODE(code = """#ifdef __BYTE_ORDER
+- #define B __BYTE_ORDER
+- #elif defined(BYTE_ORDER)
+- #define B BYTE_ORDER
+- #endif
+-
+- #ifdef __LITTLE_ENDIAN
+- #define LITTLE __LITTLE_ENDIAN
+- #elif defined(LITTLE_ENDIAN)
+- #define LITTLE LITTLE_ENDIAN
+- #endif
+-
+- #if !defined(LITTLE) || !defined(B) || LITTLE != B
+- #error Not little endian.
+- #endif""",
+- headers="endian.h sys/endian.h",
+- define="HAVE_LITTLE_ENDIAN")
+- conf.CHECK_CODE(code = """#ifdef __BYTE_ORDER
+- #define B __BYTE_ORDER
+- #elif defined(BYTE_ORDER)
+- #define B BYTE_ORDER
+- #endif
+-
+- #ifdef __BIG_ENDIAN
+- #define BIG __BIG_ENDIAN
+- #elif defined(BIG_ENDIAN)
+- #define BIG BIG_ENDIAN
+- #endif
+-
+- #if !defined(BIG) || !defined(B) || BIG != B
+- #error Not big endian.
+- #endif""",
+- headers="endian.h sys/endian.h",
+- define="HAVE_BIG_ENDIAN")
+-
+- if not conf.CONFIG_SET("HAVE_BIG_ENDIAN") and not conf.CONFIG_SET("HAVE_LITTLE_ENDIAN"):
+- # That didn't work! Do runtime test.
+- conf.CHECK_CODE("""union { int i; char c[sizeof(int)]; } u;
+- u.i = 0x01020304;
+- return u.c[0] == 0x04 && u.c[1] == 0x03 && u.c[2] == 0x02 && u.c[3] == 0x01 ? 0 : 1;""",
+- addmain=True, execute=True,
+- define='HAVE_LITTLE_ENDIAN',
+- msg="Checking for HAVE_LITTLE_ENDIAN - runtime")
+- conf.CHECK_CODE("""union { int i; char c[sizeof(int)]; } u;
+- u.i = 0x01020304;
+- return u.c[0] == 0x01 && u.c[1] == 0x02 && u.c[2] == 0x03 && u.c[3] == 0x04 ? 0 : 1;""",
+- addmain=True, execute=True,
+- define='HAVE_BIG_ENDIAN',
+- msg="Checking for HAVE_BIG_ENDIAN - runtime")
+-
+- # Extra sanity check.
+- if conf.CONFIG_SET("HAVE_BIG_ENDIAN") == conf.CONFIG_SET("HAVE_LITTLE_ENDIAN"):
+- Logs.error("Failed endian determination. The PDP-11 is back?")
+- sys.exit(1)
+
+ conf.CHECK_CODE('return __builtin_choose_expr(1, 0, "garbage");',
+ link=True,
+--
+1.8.3.2
+
+++ /dev/null
-From 934f8c8e9439de4f15b2e61016d5d29233d8d5fa Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Wed, 16 Apr 2014 08:01:36 -0300
-Subject: [PATCH 5/5] build: find blkcnt_t size via array
-
-Using the same trick as commit 0d9bb86293c9d39298786df095c73a6251b08b7e
-find blkcnt_t size via an array so that it can be determined via build
-rather than running it.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- source3/wscript | 22 ++++++++++++----------
- 1 file changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/source3/wscript b/source3/wscript
-index aade503..6a5728f 100644
---- a/source3/wscript
-+++ b/source3/wscript
-@@ -277,18 +277,20 @@ int main(int argc, char **argv)
- headers='sys/types.h sys/stat.h unistd.h')
-
- if "HAVE_BLKCNT_T" in conf.env:
-- conf.CHECK_CODE('''
-- return sizeof(blkcnt_t) == 4 ? 0 : 1''',
-- 'SIZEOF_BLKCNT_T_4', execute=True,
-- headers='replace.h sys/types.h sys/stat.h unistd.h',
-- msg="Checking whether blkcnt_t is 32 bit")
-+ conf.CHECK_CODE('''
-+ static int test_array[1 - 2 * !(((long int)(sizeof(blkcnt_t))) <= 4)];''',
-+ 'SIZEOF_BLKCNT_T_4',
-+ headers='replace.h sys/types.h sys/stat.h unistd.h',
-+ msg="Checking whether blkcnt_t is 32 bit")
-
-+ # If sizeof is 4 it can't be 8
- if "HAVE_BLKCNT_T" in conf.env:
-- conf.CHECK_CODE('''
-- return sizeof(blkcnt_t) == 8 ? 0 : 1''',
-- 'SIZEOF_BLKCNT_T_8', execute=True,
-- headers='replace.h sys/types.h sys/stat.h unistd.h',
-- msg="Checking whether blkcnt_t is 64 bit")
-+ if not conf.CONFIG_SET('SIZEOF_BLKCNT_T_4'):
-+ conf.CHECK_CODE('''
-+ static int test_array[1 - 2 * !(((long int)(sizeof(blkcnt_t))) <= 8)];''',
-+ 'SIZEOF_BLKCNT_T_8',
-+ headers='replace.h sys/types.h sys/stat.h unistd.h',
-+ msg="Checking whether blkcnt_t is 64 bit")
-
- # Check for POSIX capability support
- conf.CHECK_FUNCS_IN('cap_get_proc', 'cap', headers='sys/capability.h')
---
-1.8.3.2
-
--- /dev/null
+From fd3eb1e9f712e4c96c0b55d4203745afb2bcc8c2 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Wed, 9 Apr 2014 10:21:59 -0300
+Subject: [PATCH 3/5] build: make wafsamba CHECK_SIZEOF cross-compile friendly
+
+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.
+
+The new 'critical' option is used to make the invocation die or not
+according to each test.
+The default is True since normally it's expected to find a proper
+result and should error out if not.
+
+Status: Upstream.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ buildtools/wafsamba/samba_autoconf.py | 28 ++++++++++++++++------------
+ 1 file changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
+index 59d9e79..f60ce9d 100644
+--- a/buildtools/wafsamba/samba_autoconf.py
++++ b/buildtools/wafsamba/samba_autoconf.py
+@@ -304,23 +304,27 @@ def CHECK_FUNCS(conf, list, link=True, lib=None, headers=None):
+
+
+ @conf
+-def CHECK_SIZEOF(conf, vars, headers=None, define=None):
++def CHECK_SIZEOF(conf, vars, headers=None, define=None, critical=True):
+ '''check the size of a type'''
+- ret = True
+ for v in TO_LIST(vars):
+ v_define = define
++ ret = False
+ if v_define is None:
+ v_define = 'SIZEOF_%s' % v.upper().replace(' ', '_')
+- if not CHECK_CODE(conf,
+- 'printf("%%u", (unsigned)sizeof(%s))' % v,
+- define=v_define,
+- execute=True,
+- define_ret=True,
+- quote=False,
+- headers=headers,
+- local_include=False,
+- msg="Checking size of %s" % v):
+- ret = False
++ for size in list((1, 2, 4, 8, 16, 32)):
++ if CHECK_CODE(conf,
++ 'static int test_array[1 - 2 * !(((long int)(sizeof(%s))) <= %d)];' % (v, size),
++ define=v_define,
++ quote=False,
++ headers=headers,
++ local_include=False,
++ msg="Checking if size of %s == %d" % (v, size)):
++ conf.DEFINE(v_define, size)
++ ret = True
++ break
++ if not ret and critical:
++ Logs.error("Couldn't determine size of '%s'" % v)
++ sys.exit(1)
+ return ret
+
+ @conf
+--
+1.8.3.2
+
--- /dev/null
+From 1a7f4f5e3fbbe83e147fffdfe00d7f37181a8ec1 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Wed, 9 Apr 2014 10:39:06 -0300
+Subject: [PATCH 4/5] build: tweak SIZEOF utmp->ut_line
+
+Set the critical parameter of CHECK_SIZEOF utmp->ut_line to False since
+it's used to find out if utmp support should be enabled.
+This is necessary with the introduction of the cross-compile aware
+CHECK_SIZEOF.
+
+Status: Upstream.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ source3/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/wscript b/source3/wscript
+index e81a47b..aade503 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -812,7 +812,7 @@ msg.msg_acctrightslen = sizeof(fd);
+ 'PUTUTLINE_RETURNS_UTMP', headers='utmp.h',
+ msg="Checking whether pututline returns pointer")
+ conf.CHECK_SIZEOF(['((struct utmp *)NULL)->ut_line'], headers='utmp.h',
+- define='SIZEOF_UTMP_UT_LINE')
++ define='SIZEOF_UTMP_UT_LINE', critical=False)
+ if not conf.CONFIG_SET('SIZEOF_UTMP_UT_LINE'):
+ conf.env.with_utmp = False
+ elif int(conf.env.SIZEOF_UTMP_UT_LINE) < 15:
+--
+1.8.3.2
+
+++ /dev/null
-From ee4e06b7223fb2925bc887c89216a66029d44862 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 1 Apr 2014 06:41:47 -0300
-Subject: [PATCH 2/5] build: unify and fix endian tests
-
-Unify the endian tests out of lib/ccan/wscript into wafsamba since
-they're almost cross-compile friendly.
-While at it fix them to be so by moving the preprocessor directives out
-of main scope since that will fail.
-And keep the WORDS_BIGENDIAN, HAVE_LITTLE_ENDIAN and HAVE_BIG_ENDIAN
-defines separate because of different codebases.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- buildtools/wafsamba/wscript | 65 ++++++++++++++++++++++++++++++++++++++++++---
- lib/ccan/wscript | 55 --------------------------------------
- 2 files changed, 62 insertions(+), 58 deletions(-)
-
-diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
-index 7984227..1a2cfe6 100755
---- a/buildtools/wafsamba/wscript
-+++ b/buildtools/wafsamba/wscript
-@@ -390,9 +390,68 @@ def configure(conf):
- else:
- conf.define('SHLIBEXT', "so", quote=True)
-
-- conf.CHECK_CODE('long one = 1; return ((char *)(&one))[0]',
-- execute=True,
-- define='WORDS_BIGENDIAN')
-+ # First try a header check for cross-compile friendlyness
-+ conf.CHECK_CODE(code = """#ifdef __BYTE_ORDER
-+ #define B __BYTE_ORDER
-+ #elif defined(BYTE_ORDER)
-+ #define B BYTE_ORDER
-+ #endif
-+
-+ #ifdef __LITTLE_ENDIAN
-+ #define LITTLE __LITTLE_ENDIAN
-+ #elif defined(LITTLE_ENDIAN)
-+ #define LITTLE LITTLE_ENDIAN
-+ #endif
-+
-+ #if !defined(LITTLE) || !defined(B) || LITTLE != B
-+ #error Not little endian.
-+ #endif
-+ int main(void) { return 0; }""",
-+ addmain=False,
-+ headers="endian.h sys/endian.h",
-+ define="HAVE_LITTLE_ENDIAN")
-+ conf.CHECK_CODE(code = """#ifdef __BYTE_ORDER
-+ #define B __BYTE_ORDER
-+ #elif defined(BYTE_ORDER)
-+ #define B BYTE_ORDER
-+ #endif
-+
-+ #ifdef __BIG_ENDIAN
-+ #define BIG __BIG_ENDIAN
-+ #elif defined(BIG_ENDIAN)
-+ #define BIG BIG_ENDIAN
-+ #endif
-+
-+ #if !defined(BIG) || !defined(B) || BIG != B
-+ #error Not big endian.
-+ #endif
-+ int main(void) { return 0; }""",
-+ addmain=False,
-+ headers="endian.h sys/endian.h",
-+ define="HAVE_BIG_ENDIAN")
-+
-+ if not conf.CONFIG_SET("HAVE_BIG_ENDIAN") and not conf.CONFIG_SET("HAVE_LITTLE_ENDIAN"):
-+ # That didn't work! Do runtime test.
-+ conf.CHECK_CODE("""union { int i; char c[sizeof(int)]; } u;
-+ u.i = 0x01020304;
-+ return u.c[0] == 0x04 && u.c[1] == 0x03 && u.c[2] == 0x02 && u.c[3] == 0x01 ? 0 : 1;""",
-+ addmain=True, execute=True,
-+ define='HAVE_LITTLE_ENDIAN',
-+ msg="Checking for HAVE_LITTLE_ENDIAN - runtime")
-+ conf.CHECK_CODE("""union { int i; char c[sizeof(int)]; } u;
-+ u.i = 0x01020304;
-+ return u.c[0] == 0x01 && u.c[1] == 0x02 && u.c[2] == 0x03 && u.c[3] == 0x04 ? 0 : 1;""",
-+ addmain=True, execute=True,
-+ define='HAVE_BIG_ENDIAN',
-+ msg="Checking for HAVE_BIG_ENDIAN - runtime")
-+
-+ # Extra sanity check.
-+ if conf.CONFIG_SET("HAVE_BIG_ENDIAN") == conf.CONFIG_SET("HAVE_LITTLE_ENDIAN"):
-+ Logs.error("Failed endian determination. The PDP-11 is back?")
-+ sys.exit(1)
-+ else:
-+ if conf.CONFIG_SET("HAVE_BIG_ENDIAN"):
-+ conf.DEFINE('WORDS_BIGENDIAN', 1)
-
- # check if signal() takes a void function
- if conf.CHECK_CODE('return *(signal (0, 0)) (0) == 1',
-diff --git a/lib/ccan/wscript b/lib/ccan/wscript
-index 1c5f337..0e540db 100644
---- a/lib/ccan/wscript
-+++ b/lib/ccan/wscript
-@@ -25,61 +25,6 @@ def configure(conf):
- conf.CHECK_CODE('int __attribute__((used)) func(int x) { return x; }',
- addmain=False, link=False, cflags=conf.env['WERROR_CFLAGS'],
- define='HAVE_ATTRIBUTE_USED')
-- # We try to use headers for a compile-time test.
-- conf.CHECK_CODE(code = """#ifdef __BYTE_ORDER
-- #define B __BYTE_ORDER
-- #elif defined(BYTE_ORDER)
-- #define B BYTE_ORDER
-- #endif
--
-- #ifdef __LITTLE_ENDIAN
-- #define LITTLE __LITTLE_ENDIAN
-- #elif defined(LITTLE_ENDIAN)
-- #define LITTLE LITTLE_ENDIAN
-- #endif
--
-- #if !defined(LITTLE) || !defined(B) || LITTLE != B
-- #error Not little endian.
-- #endif""",
-- headers="endian.h sys/endian.h",
-- define="HAVE_LITTLE_ENDIAN")
-- conf.CHECK_CODE(code = """#ifdef __BYTE_ORDER
-- #define B __BYTE_ORDER
-- #elif defined(BYTE_ORDER)
-- #define B BYTE_ORDER
-- #endif
--
-- #ifdef __BIG_ENDIAN
-- #define BIG __BIG_ENDIAN
-- #elif defined(BIG_ENDIAN)
-- #define BIG BIG_ENDIAN
-- #endif
--
-- #if !defined(BIG) || !defined(B) || BIG != B
-- #error Not big endian.
-- #endif""",
-- headers="endian.h sys/endian.h",
-- define="HAVE_BIG_ENDIAN")
--
-- if not conf.CONFIG_SET("HAVE_BIG_ENDIAN") and not conf.CONFIG_SET("HAVE_LITTLE_ENDIAN"):
-- # That didn't work! Do runtime test.
-- conf.CHECK_CODE("""union { int i; char c[sizeof(int)]; } u;
-- u.i = 0x01020304;
-- return u.c[0] == 0x04 && u.c[1] == 0x03 && u.c[2] == 0x02 && u.c[3] == 0x01 ? 0 : 1;""",
-- addmain=True, execute=True,
-- define='HAVE_LITTLE_ENDIAN',
-- msg="Checking for HAVE_LITTLE_ENDIAN - runtime")
-- conf.CHECK_CODE("""union { int i; char c[sizeof(int)]; } u;
-- u.i = 0x01020304;
-- return u.c[0] == 0x01 && u.c[1] == 0x02 && u.c[2] == 0x03 && u.c[3] == 0x04 ? 0 : 1;""",
-- addmain=True, execute=True,
-- define='HAVE_BIG_ENDIAN',
-- msg="Checking for HAVE_BIG_ENDIAN - runtime")
--
-- # Extra sanity check.
-- if conf.CONFIG_SET("HAVE_BIG_ENDIAN") == conf.CONFIG_SET("HAVE_LITTLE_ENDIAN"):
-- Logs.error("Failed endian determination. The PDP-11 is back?")
-- sys.exit(1)
-
- conf.CHECK_CODE('return __builtin_choose_expr(1, 0, "garbage");',
- link=True,
---
-1.8.3.2
-
+++ /dev/null
-From fd3eb1e9f712e4c96c0b55d4203745afb2bcc8c2 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Wed, 9 Apr 2014 10:21:59 -0300
-Subject: [PATCH 3/5] build: make wafsamba CHECK_SIZEOF cross-compile friendly
-
-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.
-
-The new 'critical' option is used to make the invocation die or not
-according to each test.
-The default is True since normally it's expected to find a proper
-result and should error out if not.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- buildtools/wafsamba/samba_autoconf.py | 28 ++++++++++++++++------------
- 1 file changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
-index 59d9e79..f60ce9d 100644
---- a/buildtools/wafsamba/samba_autoconf.py
-+++ b/buildtools/wafsamba/samba_autoconf.py
-@@ -304,23 +304,27 @@ def CHECK_FUNCS(conf, list, link=True, lib=None, headers=None):
-
-
- @conf
--def CHECK_SIZEOF(conf, vars, headers=None, define=None):
-+def CHECK_SIZEOF(conf, vars, headers=None, define=None, critical=True):
- '''check the size of a type'''
-- ret = True
- for v in TO_LIST(vars):
- v_define = define
-+ ret = False
- if v_define is None:
- v_define = 'SIZEOF_%s' % v.upper().replace(' ', '_')
-- if not CHECK_CODE(conf,
-- 'printf("%%u", (unsigned)sizeof(%s))' % v,
-- define=v_define,
-- execute=True,
-- define_ret=True,
-- quote=False,
-- headers=headers,
-- local_include=False,
-- msg="Checking size of %s" % v):
-- ret = False
-+ for size in list((1, 2, 4, 8, 16, 32)):
-+ if CHECK_CODE(conf,
-+ 'static int test_array[1 - 2 * !(((long int)(sizeof(%s))) <= %d)];' % (v, size),
-+ define=v_define,
-+ quote=False,
-+ headers=headers,
-+ local_include=False,
-+ msg="Checking if size of %s == %d" % (v, size)):
-+ conf.DEFINE(v_define, size)
-+ ret = True
-+ break
-+ if not ret and critical:
-+ Logs.error("Couldn't determine size of '%s'" % v)
-+ sys.exit(1)
- return ret
-
- @conf
---
-1.8.3.2
-
+++ /dev/null
-From 1a7f4f5e3fbbe83e147fffdfe00d7f37181a8ec1 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Wed, 9 Apr 2014 10:39:06 -0300
-Subject: [PATCH 4/5] build: tweak SIZEOF utmp->ut_line
-
-Set the critical parameter of CHECK_SIZEOF utmp->ut_line to False since
-it's used to find out if utmp support should be enabled.
-This is necessary with the introduction of the cross-compile aware
-CHECK_SIZEOF.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- source3/wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source3/wscript b/source3/wscript
-index e81a47b..aade503 100644
---- a/source3/wscript
-+++ b/source3/wscript
-@@ -812,7 +812,7 @@ msg.msg_acctrightslen = sizeof(fd);
- 'PUTUTLINE_RETURNS_UTMP', headers='utmp.h',
- msg="Checking whether pututline returns pointer")
- conf.CHECK_SIZEOF(['((struct utmp *)NULL)->ut_line'], headers='utmp.h',
-- define='SIZEOF_UTMP_UT_LINE')
-+ define='SIZEOF_UTMP_UT_LINE', critical=False)
- if not conf.CONFIG_SET('SIZEOF_UTMP_UT_LINE'):
- conf.env.with_utmp = False
- elif int(conf.env.SIZEOF_UTMP_UT_LINE) < 15:
---
-1.8.3.2
-
Checking whether the realpath function allows a NULL argument: OK
Checking whether POSIX capabilities are available: OK
Checking for ftruncate extend: OK
+vfs_fileid checking for statfs() and struct statfs.f_fsid: OK
getcwd takes a NULL argument: OK
Checking uname sysname type: "Linux"
Checking uname release type: "3.0.0"
--without-ldap \
--without-cluster-support \
--without-ads \
+ --bundled-libraries='!asn1_compile,!compile_et' \
$(SAMBA4_CONF_OPT) \
)
endef
projects / buildroot.git / commitdiff