From d6915195f18f838cb6ee91aa136318a391512e69 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Feb 26 2019 21:59:03 +0000 Subject: Rebase patch due to conflicts --- diff --git a/0001-Fix-detection-of-HAVE_LARGEFILE-with-python2.patch b/0001-Fix-detection-of-HAVE_LARGEFILE-with-python2.patch index bace4c2..c8d6089 100644 --- a/0001-Fix-detection-of-HAVE_LARGEFILE-with-python2.patch +++ b/0001-Fix-detection-of-HAVE_LARGEFILE-with-python2.patch @@ -1,9 +1,10 @@ -From 4b2829af05e4a1ebf2ba29d84cb43245e1577dd5 Mon Sep 17 00:00:00 2001 +From de630eb61fd2321eae5fe73ecc56ab283fc66d5d Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Thu, 17 Jan 2019 21:03:15 +0100 -Subject: [PATCH] Fix detection of HAVE_LARGEFILE with python2 +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() @@ -59,7 +60,7 @@ Signed-off-by: Lukas Slebodnik 1 file changed, 1 insertion(+) diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py -index c0b9ae4929649692c9870edf28e8e0aa94fca113..af3b82e25f1366b74f57659978e272a075588447 100644 +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'): @@ -67,9 +68,9 @@ index c0b9ae4929649692c9870edf28e8e0aa94fca113..af3b82e25f1366b74f57659978e272a0 getconf_cflags = conf.CHECK_COMMAND(['getconf', 'LFS_CFLAGS']); if getconf_cflags is not False: + getconf_cflags = str(getconf_cflags) - if (conf.CHECK_CODE('return !(sizeof(off_t) >= 8)', + if (conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1', define='WORKING_GETCONF_LFS_CFLAGS', execute=True, -- -2.20.1 +2.21.0.rc1