[med-svn] [eigensoft] 03/03: Add missing Build-Depends libgsl-dev, Propagate hardening options

[Andreas Tille]

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

tille pushed a commit to branch master
in repository eigensoft.

commit c3a7c8c2948fe6ed9a893111d0a047551df54f56
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jan 26 14:18:40 2016 +0100

    Add missing Build-Depends libgsl-dev, Propagate hardening options
---
 debian/changelog               |  2 ++
 debian/control                 |  3 ++-
 debian/patches/blas.patch      | 16 ++++++++++++++++
 debian/patches/hardening.patch | 19 +++++++++++++++++++
 debian/patches/series          |  2 ++
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9704262..16dbd89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ eigensoft (6.0.1+ds-1) UNRELEASED; urgency=medium
   * Remove -dbg package which is autogenerated now
   * DEP3 header and removed unused patches
   * Removed README.Debian which is not user oriented
+  * Add missing Build-Depends libgsl-dev
+  * Propagate hardening options
 
  -- Andreas Tille <tille at debian.org>  Tue, 26 Jan 2016 12:55:32 +0100
 
diff --git a/debian/control b/debian/control
index 255036b..d86ade2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                gfortran,
                libblas-dev,
-               liblapack-dev
+               liblapack-dev,
+               libgsl-dev
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/eigensoft.git
 Vcs-Git: https://anonscm.debian.org/debian-med/eigensoft.git
diff --git a/debian/patches/blas.patch b/debian/patches/blas.patch
new file mode 100644
index 0000000..ed3827c
--- /dev/null
+++ b/debian/patches/blas.patch
@@ -0,0 +1,16 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -15,11 +15,11 @@ endif
+ ifdef OPENBLAS
+ CFLAGS  = -I../include -I$(OPENBLAS)/include -D_GNU_SOURCE
+ LDFLAGS = -L$(OPENBLAS)/lib -D_GNU_SOURCE
+-LDLIBS  = -Wl,-Bdynamic -lgsl -Wl,-Bstatic -lopenblas -Wl,-Bdynamic -lgfortran -pthread -lm
++LDLIBS  = -Wl,-Bdynamic -lgsl -Wl,-Bstatic -lblas -Wl,-Bdynamic -lgfortran -pthread -lm
+ else
+ CFLAGS  = -I../include -D_GNU_SOURCE
+ LDFLAGS = -D_GNU_SOURCE
+-LDLIBS  = -lgsl -lopenblas -lgfortran -pthread -lm
++LDLIBS  = -lgsl -lblas -lgfortran -pthread -lm
+ endif
+ 
+ CC = gcc
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..7838059
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,19 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,12 +13,12 @@ endif
+ endif
+ 
+ ifdef OPENBLAS
+-CFLAGS  = -I../include -I$(OPENBLAS)/include -D_GNU_SOURCE
+-LDFLAGS = -L$(OPENBLAS)/lib -D_GNU_SOURCE
++CFLAGS  += -I../include -I$(OPENBLAS)/include -D_GNU_SOURCE
++LDFLAGS += -L$(OPENBLAS)/lib -D_GNU_SOURCE
+ LDLIBS  = -Wl,-Bdynamic -lgsl -Wl,-Bstatic -lblas -Wl,-Bdynamic -lgfortran -pthread -lm
+ else
+-CFLAGS  = -I../include -D_GNU_SOURCE
+-LDFLAGS = -D_GNU_SOURCE
++CFLAGS  += -I../include -D_GNU_SOURCE
++LDFLAGS += -D_GNU_SOURCE
+ LDLIBS  = -lgsl -lblas -lgfortran -pthread -lm
+ endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index aa7d7d2..3d10cde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
 #atlasLinkNotNeeded.patch
 #optimizingBlasDependencies.patch
 perlPath.patch
+blas.patch
+hardening.patch

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