fix gcc-9 issue

6 files changed, 31 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 7d598862..41e0afa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libunistring (0.9.10-2) UNRELEASED; urgency=medium
+
+  * New patch debian/patches/0705-gcc-9.patch:
+    - Fix gcc-9 issue.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Thu, 11 Jul 2019 18:05:24 +0200
+
 libunistring (0.9.10-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 62934ed0..a05b5f65 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  debhelper (>= 11),
+ gcc-9
 Standards-Version: 4.1.5
 Section: libs
 Homepage: https://www.gnu.org/software/libunistring/
diff --git a/debian/files b/debian/files
deleted file mode 100644
index e99f64e9..00000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-libunistring_0.9.10-1_source.buildinfo libs optional
diff --git a/debian/patches/0705-gcc-9.patch b/debian/patches/0705-gcc-9.patch
new file mode 100644
index 00000000..986e741e
--- /dev/null
+++ b/debian/patches/0705-gcc-9.patch
@@ -0,0 +1,19 @@
+Description: Patch for gcc-9 compat
+Author: based on an patch from Bruno Haible <bruno@clisp.org> 
+Bug-Debian:https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925762 
+Last-Update: 2019-07-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/tests/glthread/thread.h
+===================================================================
+--- trunk.orig/tests/glthread/thread.h
++++ trunk/tests/glthread/thread.h
+@@ -133,7 +133,7 @@ extern int glthread_in_use (void);
+    call to foo(...) in the same function.  To avoid this, we test the
+    address of a function in libpthread that we don't use.  */
+ 
+-#  pragma weak pthread_create
++/*#  pragma weak pthread_create */
+ 
+ #  ifndef pthread_sigmask /* Do not declare rpl_pthread_sigmask weak.  */
+ #   pragma weak pthread_sigmask
diff --git a/debian/patches/series b/debian/patches/series
index f107ca41..496de810 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0100-float-endian-detection.patch
 0700-multiarch-libc.patch
+0705-gcc-9.patch
diff --git a/debian/rules b/debian/rules
index 2e22b6b9..35452121 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ DEB_MAKE_CHECK_TARGET = check
 
 VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/')
 
+export CC=gcc-9
+export CXX=g++-9 
+
 %:
 	dh $@