From de630eb61fd2321eae5fe73ecc56ab283fc66d5d Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 18 Jan 2019 16:36:52 +0100 Subject: [PATCH] wafsamba: Fix detection of HAVE_LARGEFILE with python2 There is an assertion if "getconf LFS_CFLAGS" does not return empty string. It failed becase we had `unicode` and not `str`. File "/builddir/build/BUILD/talloc-2.1.15/third_party/waf/waflib/Scripting.py", line 158, in waf_entry_point run_commands() File "/builddir/build/BUILD/talloc-2.1.15/third_party/waf/waflib/Scripting.py", line 251, in run_commands ctx = run_command(cmd_name) File "/builddir/build/BUILD/talloc-2.1.15/third_party/waf/waflib/Scripting.py", line 235, in run_command ctx.execute() File "/builddir/build/BUILD/talloc-2.1.15/third_party/waf/waflib/Configure.py", line 159, in execute super(ConfigurationContext, self).execute() File "/builddir/build/BUILD/talloc-2.1.15/third_party/waf/waflib/Context.py", line 204, in execute self.recurse([os.path.dirname(g_module.root_path)]) File "/builddir/build/BUILD/talloc-2.1.15/third_party/waf/waflib/Context.py", line 286, in recurse user_function(self) File "/builddir/build/BUILD/talloc-2.1.15/wscript", line 37, in configure conf.RECURSE('lib/replace') File "./buildtools/wafsamba/samba_utils.py", line 33, in fun return f(*k, **kw) File "./buildtools/wafsamba/samba_utils.py", line 436, in RECURSE return ctx.recurse(relpath) File "/builddir/build/BUILD/talloc-2.1.15/third_party/waf/waflib/Context.py", line 286, in recurse user_function(self) File "/builddir/build/BUILD/talloc-2.1.15/third_party/waf/waflib/Utils.py", line 816, in wrap ret = fun(*k) File "/builddir/build/BUILD/talloc-2.1.15/lib/replace/wscript", line 30, in configure conf.RECURSE('buildtools/wafsamba') File "./buildtools/wafsamba/samba_utils.py", line 33, in fun return f(*k, **kw) File "./buildtools/wafsamba/samba_utils.py", line 436, in RECURSE return ctx.recurse(relpath) File "/builddir/build/BUILD/talloc-2.1.15/third_party/waf/waflib/Context.py", line 286, in recurse user_function(self) File "/builddir/build/BUILD/talloc-2.1.15/third_party/waf/waflib/Utils.py", line 816, in wrap ret = fun(*k) File "/builddir/build/BUILD/talloc-2.1.15/buildtools/wafsamba/wscript", line 481, in configure if not conf.CHECK_LARGEFILE(): File "./buildtools/wafsamba/samba_utils.py", line 33, in fun return f(*k, **kw) File "./buildtools/wafsamba/samba_conftests.py", line 100, in CHECK_LARGEFILE conf.DEFINE(flag_split[0], '1') File "./buildtools/wafsamba/samba_utils.py", line 33, in fun return f(*k, **kw) File "./buildtools/wafsamba/samba_autoconf.py", line 20, in DEFINE conf.define(d, v, quote=quote) File "./buildtools/wafsamba/samba_utils.py", line 33, in fun return f(*k, **kw) File "./buildtools/wafsamba/samba_waf18.py", line 89, in define assert key and isinstance(key, str) AssertionError Signed-off-by: Lukas Slebodnik --- buildtools/wafsamba/samba_conftests.py | 1 + 1 file changed, 1 insertion(+) diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py index ef632ba903369e4211991f17a3b204bcd96c3a2f..2390bd8aff416cbc313cd249cd7c6fa6b0e85a34 100644 --- a/buildtools/wafsamba/samba_conftests.py +++ b/buildtools/wafsamba/samba_conftests.py @@ -86,6 +86,7 @@ def CHECK_LARGEFILE(conf, define='HAVE_LARGEFILE'): '''see what we need for largefile support''' getconf_cflags = conf.CHECK_COMMAND(['getconf', 'LFS_CFLAGS']); if getconf_cflags is not False: + getconf_cflags = str(getconf_cflags) if (conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1', define='WORKING_GETCONF_LFS_CFLAGS', execute=True, -- 2.21.0.rc1