summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-09-11 10:24:05 +0200
committerJonas Smedegaard <dr@jones.dk>2017-09-11 10:24:05 +0200
commitb1722e1173e4e5dce035b8f9af9f66a8fea67c98 (patch)
tree0f967fd6a7f845f18bbd709a6da57baca4d8e7e8 /debian/patches
parent6e90ca954be5ea2b6b9a364722b9211ef455cf0e (diff)
Incorporate NMU 0.5.4-1.1.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/gcc-7-compat.patch20
-rw-r--r--debian/patches/series1
2 files changed, 21 insertions, 0 deletions
diff --git a/debian/patches/gcc-7-compat.patch b/debian/patches/gcc-7-compat.patch
new file mode 100644
index 0000000..14f11e7
--- /dev/null
+++ b/debian/patches/gcc-7-compat.patch
@@ -0,0 +1,20 @@
+Description: Use -D_GNU_SOURCE for gcc-7 compatibility
+ baresip fails to build with gcc-7 because libdirectfb-dev needs to know
+ the size of struct timespec, which is an opaque type unless we're using
+ GNU extensions, but libre-dev sets -std=c99. Adjust cflags to enable
+ _GNU_SOURCE.
+Author: Steve Langasek <steve.langasek@ubuntu.com>
+Bug-Debian: https://bugs.debian.org/872406
+
+Index: baresip-0.5.4/Makefile
+===================================================================
+--- baresip-0.5.4.orig/Makefile
++++ baresip-0.5.4/Makefile
+@@ -49,6 +49,7 @@
+ CFLAGS += -I. -Iinclude -I$(LIBRE_INC) -I$(SYSROOT)/include
+ CFLAGS += -I$(LIBREM_PATH)/include
+ CFLAGS += -I$(SYSROOT)/local/include/rem -I$(SYSROOT)/include/rem
++CFLAGS += -D_GNU_SOURCE
+
+ CXXFLAGS += -I. -Iinclude -I$(LIBRE_INC)
+ CXXFLAGS += -I$(LIBREM_PATH)/include
diff --git a/debian/patches/series b/debian/patches/series
index 7440c68..1c019f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
2001_drop_libre_so_check.patch
+gcc-7-compat.patch