Package: libtickit
Version: 0.2-3
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch
Hi James,
Thanks for the fix to bug #895268.
We are carrying another additional patch in Ubuntu which I apparently failed
to forward previously. The libtickit test suite was failing to pass in
Ubuntu because the dpkg-buildflags were not being passed to the build of
that test suite, and an incompatibility between fortify options of the test
binaries versus the library caused a problem.
The attached patch fixes this to pass the dpkg-buildflags consistently
everywhere. While this isn't needed in Debian, I would appreciate it if you
would consider including this patch in the Debian package; otherwise, please
let me know if I should forward it upstream directly.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru libtickit-0.2/debian/patches/cflags-for-tests.patch
libtickit-0.2/debian/patches/cflags-for-tests.patch
--- libtickit-0.2/debian/patches/cflags-for-tests.patch 1969-12-31
16:00:00.0 -0800
+++ libtickit-0.2/debian/patches/cflags-for-tests.patch 2018-04-08
22:17:54.0 -0700
@@ -0,0 +1,20 @@
+Description: include configured compiler flags when building test cases
+ The test suite fails on Ubuntu because the default buildflags there cause
+ a _FORTIFY_SOURCE failure. Pass $CFLAGS and $LDFLAGS when building the
+ test cases, to correct this flag mismatch.
+Author: Steve Langasek
+Last-Modified: 2018-04-08
+
+Index: libtickit-0.2/Makefile
+===
+--- libtickit-0.2.orig/Makefile
libtickit-0.2/Makefile
+@@ -73,7 +73,7 @@
+ perl $^ > $@
+
+ t/%.t: t/%.c $(LIBRARY) t/taplib.lo t/mockterm.lo t/taplib-tickit.lo
+- $(LIBTOOL) --mode=link --tag=CC gcc -o $@ -Iinclude -std=c99 -ggdb $^
++ $(LIBTOOL) --mode=link --tag=CC gcc $(CFLAGS) $(LDFLAGS) -o $@
-Iinclude -std=c99 -ggdb $^
+
+ t/%.lo: t/%.c
+ $(LIBTOOL) --mode=compile --tag=CC gcc $(CFLAGS) -o $@ -c $^
diff -Nru libtickit-0.2/debian/patches/series
libtickit-0.2/debian/patches/series
--- libtickit-0.2/debian/patches/series 2018-05-23 19:17:24.0 -0700
+++ libtickit-0.2/debian/patches/series 2018-05-24 14:04:36.0 -0700
@@ -1,3 +1,4 @@
# exported from git by git-debcherry
0001-Remember-to-FD_ZERO-a-new-fd_set-thanks-Steve-Langas.patch
0002-Don-t-attempt-to-select-on-invalid-fds-thanks-Steve-.patch
+cflags-for-tests.patch
