summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0001-Disable-python-tests.patch29
-rw-r--r--debian/patches/cross.patch50
-rw-r--r--debian/patches/series2
3 files changed, 81 insertions, 0 deletions
diff --git a/debian/patches/0001-Disable-python-tests.patch b/debian/patches/0001-Disable-python-tests.patch
new file mode 100644
index 0000000..7d0b2fc
--- /dev/null
+++ b/debian/patches/0001-Disable-python-tests.patch
@@ -0,0 +1,29 @@
+From e6d9af8a1ca6134e02ba09212756d87f4f38f7e6 Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent@gmail.com>
+Date: Fri, 13 Sep 2019 19:46:27 +0200
+Subject: [PATCH] Disable python tests
+
+As python-tevent is not built.
+
+Forwarded: not-needed
+---
+ wscript | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 3d0d71d..f4b0c26 100644
+--- a/wscript
++++ b/wscript
+@@ -152,7 +152,8 @@ def test(ctx):
+ samba_utils.ADD_LD_LIBRARY_PATH('bin/shared')
+ samba_utils.ADD_LD_LIBRARY_PATH('bin/shared/private')
+
+- pyret = samba_utils.RUN_PYTHON_TESTS(['bindings.py'])
++ # pyret = samba_utils.RUN_PYTHON_TESTS(['bindings.py'])
++ pyret = 0
+
+ unit_test_ret = 0
+ unit_tests = [
+--
+2.30.2
+
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
new file mode 100644
index 0000000..89155f4
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,50 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Fri, 06 Sep 2019 21:41:32 +0200
+Subject: [PATCH] cross build fixes
+
+- waf performs sizeof checks by running programs.
+
+--- tevent.orig/buildtools/wafsamba/samba_conftests.py
++++ tevent/buildtools/wafsamba/samba_conftests.py
+@@ -86,9 +86,9 @@ def CHECK_LARGEFILE(conf, define='HAVE_L
+ '''see what we need for largefile support'''
+ getconf_cflags = conf.CHECK_COMMAND(['getconf', 'LFS_CFLAGS'])
+ if getconf_cflags is not False:
+- if (conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1',
++ if (conf.CHECK_CODE('char dummy[(sizeof(off_t) < 8) ? -1 : 1]',
+ define='WORKING_GETCONF_LFS_CFLAGS',
+- execute=True,
++ execute=False,
+ cflags=getconf_cflags,
+ msg='Checking getconf large file support flags work')):
+ conf.ADD_CFLAGS(getconf_cflags)
+@@ -101,23 +101,23 @@ def CHECK_LARGEFILE(conf, define='HAVE_L
+ else:
+ conf.DEFINE(flag_split[0], flag_split[1])
+
+- if conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1',
++ if conf.CHECK_CODE('char dummy[(sizeof(off_t) < 8) ? -1 : 1]',
+ define,
+- execute=True,
++ execute=False,
+ msg='Checking for large file support without additional flags'):
+ return True
+
+- if conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1',
++ if conf.CHECK_CODE('char dummy[(sizeof(off_t) < 8) ? -1 : 1]',
+ define,
+- execute=True,
++ execute=False,
+ cflags='-D_FILE_OFFSET_BITS=64',
+ msg='Checking for -D_FILE_OFFSET_BITS=64'):
+ conf.DEFINE('_FILE_OFFSET_BITS', 64)
+ return True
+
+- if conf.CHECK_CODE('if (sizeof(off_t) < 8) return 1',
++ if conf.CHECK_CODE('char dummy[(sizeof(off_t) < 8) ? -1 : 1]',
+ define,
+- execute=True,
++ execute=False,
+ cflags='-D_LARGE_FILES',
+ msg='Checking for -D_LARGE_FILES'):
+ conf.DEFINE('_LARGE_FILES', 1)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9a6b089
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Disable-python-tests.patch
+cross.patch