[med-svn] [seer] 04/07: Adapt patches

Andreas Tille tille at debian.org
Thu Apr 14 11:45:05 UTC 2016 

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

tille pushed a commit to branch master
in repository seer.

commit d29c13c9d8a5bfa723fca59c9c2eeba95aacd4c4
Author: Andreas Tille <tille at debian.org>
Date:   Thu Apr 14 12:02:26 2016 +0200

    Adapt patches
---
 debian/patches/fix_lib_location.patch         | 22 +++++++++++++---------
 debian/patches/hardening.patch                | 22 +++++++++++++---------
 debian/patches/pthread_versus_hardening.patch | 20 --------------------
 debian/patches/series                         |  1 -
 4 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/debian/patches/fix_lib_location.patch b/debian/patches/fix_lib_location.patch
index e27b273..61969e4 100644
--- a/debian/patches/fix_lib_location.patch
+++ b/debian/patches/fix_lib_location.patch
@@ -4,17 +4,21 @@ Description: Remove non-existing library pathes
 
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -11,10 +11,10 @@ BINDIR=$(PREFIX)/bin
- #COMBINE_LDLIBS=-L../gzstream -L$(PREFIX)/lib -lgzstream -lz -lboost_program_options
+@@ -12,12 +12,12 @@ BINDIR=$(PREFIX)/bin
  #FILTER_LDLIBS=-L$(PREFIX)/lib -lboost_program_options -mkl
  # gcc
--CXXFLAGS=-Wall -O3 -std=c++11
--SEER_LDLIBS=-L../gzstream -L$(PREFIX)/lib -lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas
-+CXXFLAGS+=-Wall -O3 -std=c++11
-+SEER_LDLIBS=-lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas $(LDFLAGS)
- MAP_LDLIBS=-L$(PREFIX)/lib -lboost_program_options
+ CXXFLAGS=-Wall -O3 -std=c++11
+-SEER_LDLIBS=-L../gzstream -L$(PREFIX)/lib -lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas -lpthread
+-MAP_LDLIBS=-L$(PREFIX)/lib -lboost_program_options -lpthread
 -COMBINE_LDLIBS=-L../gzstream -L$(PREFIX)/lib -lgzstream -lz -lboost_program_options
+-FILTER_LDLIBS=-L$(PREFIX)/lib -lboost_program_options
++SEER_LDLIBS=-lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas -lpthread
++MAP_LDLIBS=-lboost_program_options -lpthread
 +COMBINE_LDLIBS=-lgzstream -lz -lboost_program_options
- FILTER_LDLIBS=-L$(PREFIX)/lib -lboost_program_options
++FILTER_LDLIBS=-lboost_program_options
  
- CPPFLAGS=-I$(PREFIX)/include -I../gzstream -I../dlib -D DLIB_NO_GUI_SUPPORT=1 -D DLIB_USE_BLAS=1 -D DLIB_USE_LAPACK=1
+-CPPFLAGS=-I$(PREFIX)/include -I../gzstream -I../dlib -I/usr/local/hdf5/include -D DLIB_NO_GUI_SUPPORT=1 -D DLIB_USE_BLAS=1 -D DLIB_USE_LAPACK=1 -DARMA_USE_HDF5=1
++CPPFLAGS=-D DLIB_NO_GUI_SUPPORT=1 -D DLIB_USE_BLAS=1 -D DLIB_USE_LAPACK=1 -DARMA_USE_HDF5=1
+ 
+ # For static linking. To use type 'make static'
+ # Requires icpc and mkl
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index a667367..46ce88f 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -4,19 +4,23 @@ Description: Propagate hardening options
 
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -13,11 +13,11 @@ BINDIR=$(PREFIX)/bin
+@@ -11,13 +11,13 @@ BINDIR=$(PREFIX)/bin
+ #COMBINE_LDLIBS=-L../gzstream -L$(PREFIX)/lib -lgzstream -lz -lboost_program_options
+ #FILTER_LDLIBS=-L$(PREFIX)/lib -lboost_program_options -mkl
  # gcc
- CXXFLAGS+=-Wall -O3 -std=c++11
- SEER_LDLIBS=-lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas $(LDFLAGS)
--MAP_LDLIBS=-L$(PREFIX)/lib -lboost_program_options
+-CXXFLAGS=-Wall -O3 -std=c++11
+-SEER_LDLIBS=-lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas -lpthread
+-MAP_LDLIBS=-lboost_program_options -lpthread
 -COMBINE_LDLIBS=-lgzstream -lz -lboost_program_options
--FILTER_LDLIBS=-L$(PREFIX)/lib -lboost_program_options
-+MAP_LDLIBS=-lboost_program_options $(LDFLAGS)
+-FILTER_LDLIBS=-lboost_program_options
++CXXFLAGS+=-Wall -O3 -std=c++11
++SEER_LDLIBS=-lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas -lpthread $(LDFLAGS)
++MAP_LDLIBS=-lboost_program_options -lpthread $(LDFLAGS)
 +COMBINE_LDLIBS=-lgzstream -lz -lboost_program_options $(LDFLAGS)
 +FILTER_LDLIBS=-lboost_program_options $(LDFLAGS)
  
--CPPFLAGS=-I$(PREFIX)/include -I../gzstream -I../dlib -D DLIB_NO_GUI_SUPPORT=1 -D DLIB_USE_BLAS=1 -D DLIB_USE_LAPACK=1
-+CPPFLAGS+=-I$(PREFIX)/include -I../gzstream -I../dlib -D DLIB_NO_GUI_SUPPORT=1 -D DLIB_USE_BLAS=1 -D DLIB_USE_LAPACK=1
+-CPPFLAGS=-D DLIB_NO_GUI_SUPPORT=1 -D DLIB_USE_BLAS=1 -D DLIB_USE_LAPACK=1 -DARMA_USE_HDF5=1
++CPPFLAGS+=-D DLIB_NO_GUI_SUPPORT=1 -D DLIB_USE_BLAS=1 -D DLIB_USE_LAPACK=1 -DARMA_USE_HDF5=1
  
  # For static linking. To use type 'make static'
  # Requires icpc and mkl
@@ -36,4 +40,4 @@ Description: Propagate hardening options
 +	$(LINK.cpp) $^ $(FILTER_LDLIBS) $(LDFLAGS) -o $@
  
  seer_static: $(SEER_OBJECTS)
- 	$(LINK.cpp) $^ $(SEER_STATIC_LDLIBS) -o $@
+ 	$(LINK.cpp) $^ $(SEER_STATIC_LDLIBS) -o seer
diff --git a/debian/patches/pthread_versus_hardening.patch b/debian/patches/pthread_versus_hardening.patch
deleted file mode 100644
index e0864a4..0000000
--- a/debian/patches/pthread_versus_hardening.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Tue, 29 Mar 2016 19:32:29 +0200
-Description: Set -pthread inside Makefile
- When doing this in debian/rules via
-   export LDFLAGS := -pthread $(LDFLAGS)
- the hardening options are overriden
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -12,8 +12,8 @@ BINDIR=$(PREFIX)/bin
- #FILTER_LDLIBS=-L$(PREFIX)/lib -lboost_program_options -mkl
- # gcc
- CXXFLAGS+=-Wall -O3 -std=c++11
--SEER_LDLIBS=-lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas $(LDFLAGS)
--MAP_LDLIBS=-lboost_program_options $(LDFLAGS)
-+SEER_LDLIBS=-lhdf5 -lgzstream -lz -larmadillo -lboost_program_options -llapack -lblas -pthread $(LDFLAGS)
-+MAP_LDLIBS=-lboost_program_options -pthread $(LDFLAGS)
- COMBINE_LDLIBS=-lgzstream -lz -lboost_program_options $(LDFLAGS)
- FILTER_LDLIBS=-lboost_program_options $(LDFLAGS)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9762ec0..797e2d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix_lib_location.patch
 hardening.patch
-pthread_versus_hardening.patch

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

More information about the debian-med-commit mailing list