[med-svn] [eigensoft] 09/09: Adapt patches

[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 62810cac7355b4da5b85ce4a5cc8756711e34ada
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jul 18 22:16:21 2016 +0200

    Adapt patches
---
 debian/patches/blas.patch      | 19 ++++++-------------
 debian/patches/hardening.patch | 23 -----------------------
 debian/patches/libm.patch      |  9 +++++++++
 debian/patches/perlPath.patch  | 20 --------------------
 debian/patches/series          |  8 ++------
 5 files changed, 17 insertions(+), 62 deletions(-)

diff --git a/debian/patches/blas.patch b/debian/patches/blas.patch
index 2ebf20b..fbcfcc2 100644
--- a/debian/patches/blas.patch
+++ b/debian/patches/blas.patch
@@ -4,17 +4,10 @@ Last-Update: Fri, 05 Feb 2016 19:50:41 +0100
 
 --- 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
+@@ -1,5 +1,5 @@
+ CFLAGS += -I../include
+-LDLIBS += -lgsl -lopenblas -lgfortran -lrt
++LDLIBS += -lgsl -lblas -lgfortran -lrt
  
- CC = gcc
+ ifeq ($(OPTIMIZE), 1)
+ 	CFLAGS += -O2
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
deleted file mode 100644
index 131003a..0000000
--- a/debian/patches/hardening.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Propagate hardening options
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Fri, 05 Feb 2016 19:50:41 +0100
-
---- 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/libm.patch b/debian/patches/libm.patch
new file mode 100644
index 0000000..10a9cb7
--- /dev/null
+++ b/debian/patches/libm.patch
@@ -0,0 +1,9 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,5 +1,5 @@
+ CFLAGS += -I../include
+-LDLIBS += -lgsl -lblas -lgfortran -lrt
++LDLIBS += -lgsl -lblas -lgfortran -lrt -lm
+ 
+ ifeq ($(OPTIMIZE), 1)
+ 	CFLAGS += -O2
diff --git a/debian/patches/perlPath.patch b/debian/patches/perlPath.patch
deleted file mode 100644
index 2128c9c..0000000
--- a/debian/patches/perlPath.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Steffen Moeller <moeller at debian.org>
-Last-Update: Thu, 15 Sep 2011 14:20:03 +0200
-Description: Use proper Perl PATH
-
---- a/bin/fixgreen
-+++ b/bin/fixgreen
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl  -w 
-+#!/usr/bin/perl  -w
- 
- ## a better green color for gnuplot (dark green)
- ## and yellow
---- a/bin/ploteig
-+++ b/bin/ploteig
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl  -w 
-+#!/usr/bin/perl  -w
- 
- ### ploteig -i eigfile -p pops -c a:b [-t title] [-s stem] [-o outfile] [-x] [-k]  [-y] [-z sep] [-f fixgreen]
- use Getopt::Std ;
diff --git a/debian/patches/series b/debian/patches/series
index 3cdf3e1..4420531 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-#g772gfortran.patch
-#atlasLinkNotNeeded.patch
-#optimizingBlasDependencies.patch
-perlPath.patch
 blas.patch
-hardening.patch
-lapacke.patch
+# lapacke.patch
+libm.patch

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