summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-09-14 11:23:47 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-09-14 11:23:47 +0000
commit97d61d01c588fd3895ce8fb1bd1b2242bd0980a7 (patch)
treed8f2644c8adfa850d1b822cd317a23d797be101c
parentReleasing progress-linux version 0.10.1-1~progress5+u1. (diff)
downloadtevent-97d61d01c588fd3895ce8fb1bd1b2242bd0980a7.tar.xz
tevent-97d61d01c588fd3895ce8fb1bd1b2242bd0980a7.zip
Merging debian version 0.10.1-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog11
-rw-r--r--debian/control2
-rw-r--r--debian/patches/cross.patch62
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules6
5 files changed, 81 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index f5c166c..6724625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tevent (0.10.1-2) experimental; urgency=medium
+
+ [ Helmut Grohne ]
+ * Improve cross building. (Closes: #939618)
+ + Annotate the python3 Build-Depends with :any.
+ + Export CC and PKGCONFIG for waf.
+ + cross.patch: don't run an unnecessary hello world test
+ + cross.patch: use compile-only checks for sizeof validation
+
+ -- Mathieu Parent <sathieu@debian.org> Sat, 14 Sep 2019 08:35:29 +0200
+
tevent (0.10.1-1~progress5+u1) engywuck-backports; urgency=medium
* Uploading to engywuck-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 5777ae1..1331162 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper-compat (= 12),
libaio-dev [linux-any],
libtalloc-dev (>= 2.3.0~),
pkg-config,
- python3,
+ python3:any,
python3-distutils
Rules-Requires-Root: no
Standards-Version: 4.4.0
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
new file mode 100644
index 0000000..83df73e
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,62 @@
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Fri, 06 Sep 2019 21:41:32 +0200
+Subject: [PATCH] cross build fixes
+
+- waf tries running a simple hello world program.
+- waf performs sizeof checks by running programs.
+
+--- tevent-0.9.39.orig/buildtools/wafsamba/wscript
++++ tevent-0.9.39/buildtools/wafsamba/wscript
+@@ -298,7 +298,7 @@
+ conf.CHECK_CODE('printf("hello world")',
+ define='HAVE_SIMPLE_C_PROG',
+ mandatory=True,
+- execute=True,
++ execute=False,
+ headers='stdio.h',
+ msg='Checking simple C program')
+
+--- tevent-0.9.39.orig/buildtools/wafsamba/samba_conftests.py
++++ tevent-0.9.39/buildtools/wafsamba/samba_conftests.py
+@@ -86,9 +86,9 @@
+ '''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 @@
+ 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
index 5d51c3c..9a6b089 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Disable-python-tests.patch
+cross.patch
diff --git a/debian/rules b/debian/rules
index edbf0e8..1be3ff3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,11 @@
#!/usr/bin/make -f
+# Export CC and PKGCONFIG for waf
+-include /usr/share/dpkg/buildtools.mk
+export CC
+PKG_CONFIG ?= pkg-config
+export PKGCONFIG=${PKG_CONFIG}
+
CFLAGS = -g -Wall
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))