[med-svn] [qrisk2] 03/07: Enable Build on non-Linux systems

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository qrisk2.

commit 01f13f2ae5d94b44e9c0b2e341ebec689314b8fa
Author: Andreas Tille <tille at debian.org>
Date:   Wed Nov 23 19:28:25 2016 +0100

    Enable Build on non-Linux systems
---
 debian/changelog                                |  8 ++++++++
 debian/patches/build_on_non-linux_systems.patch | 22 ++++++++++++++++++++++
 debian/patches/hardening-flags.patch            | 10 ++++------
 debian/patches/series                           |  1 +
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea7cbcb..321f5eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qrisk2 (0.1.20150729-2) UNRELEASED; urgency=medium
+
+  * Enable Build on non-Linux systems (Thanks for the patch to Samuel Thibault
+    <sthibault at debian.org>)
+    Closes: #845403
+
+ -- Andreas Tille <tille at debian.org>  Wed, 23 Nov 2016 19:27:37 +0100
+
 qrisk2 (0.1.20150729-1) unstable; urgency=medium
 
   * New upstream checkout (switch to data based versioning since revision
diff --git a/debian/patches/build_on_non-linux_systems.patch b/debian/patches/build_on_non-linux_systems.patch
new file mode 100644
index 0000000..395fa68
--- /dev/null
+++ b/debian/patches/build_on_non-linux_systems.patch
@@ -0,0 +1,22 @@
+Author: Samuel Thibault <sthibault at debian.org>
+Last-Update: Wed, 23 Nov 2016 02:35:21 +0100
+Bug-Debian: https://bugs.debian.org/845403
+Description: qrisk2 currently FTBFS on !linux archs because its Makefile hardcodes
+ a dependency on /usr/include/linux/string.h.  This patch enables build also on
+ non-Linux systems
+
+--- a/Makefile
++++ b/Makefile
+@@ -81,9 +81,9 @@ clean:
+ # DO NOT DELETE
+ 
+ c/Q80_model_4_0.o: /usr/include/math.h /usr/include/features.h
+-c/Q80_model_4_0.o: /usr/include/linux/string.h
++c/Q80_model_4_0.o: /usr/include/string.h
+ c/Q80_model_4_0.o: include/clinrisk/Q80_model_4_0.h include/clinrisk/utils.h
+ c/Q80_model_4_1.o: /usr/include/math.h /usr/include/features.h
+-c/Q80_model_4_1.o: /usr/include/linux/string.h
++c/Q80_model_4_1.o: /usr/include/string.h
+ c/Q80_model_4_1.o: include/clinrisk/Q80_model_4_1.h include/clinrisk/utils.h
+-c/utils.o: /usr/include/linux/string.h include/clinrisk/utils.h
++c/utils.o: /usr/include/string.h include/clinrisk/utils.h
diff --git a/debian/patches/hardening-flags.patch b/debian/patches/hardening-flags.patch
index fa03515..22d5162 100644
--- a/debian/patches/hardening-flags.patch
+++ b/debian/patches/hardening-flags.patch
@@ -1,10 +1,8 @@
 Description: Allow hardening flags to be used
 Author: Thorsten Alteholz <debian at alteholz.de>
-Index: qrisk2_0.0.r30/Makefile
-===================================================================
---- qrisk2_0.0.r30.orig/Makefile	2013-04-18 14:55:20.000000000 +0200
-+++ qrisk2_0.0.r30/Makefile	2013-04-18 14:55:42.000000000 +0200
-@@ -41,8 +41,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -44,8 +44,8 @@ INCLUDES = -I include
  
  # compiler
  CC = gcc
@@ -15,7 +13,7 @@ Index: qrisk2_0.0.r30/Makefile
  
  # library paths
  LIBS = -Llib -lclinrisk -lm
-@@ -57,10 +57,10 @@
+@@ -60,10 +60,10 @@ executables: $(EXECUTABLES)
  $(EXECUTABLES): $(LIB_OUT)
  
  .c:
diff --git a/debian/patches/series b/debian/patches/series
index ea54a1f..e49af35 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 hardening-flags.patch
+build_on_non-linux_systems.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/qrisk2.git