[med-svn] [examl] 02/02: Hardening, docs
Andreas Tille
tille at debian.org
Wed Feb 15 18:55:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository examl.
commit 62bc6c9c0c5d312058e242a741ea8147137ef69d
Author: Andreas Tille <tille at debian.org>
Date: Wed Feb 15 19:54:53 2017 +0100
Hardening, docs
---
debian/copyright | 2 +-
debian/docs | 4 ++
debian/install | 8 +--
debian/patches/hardening.patch | 125 +++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +
6 files changed, 137 insertions(+), 5 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 890d132..8c2cf5c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Files: *
Copyright: 2006-2017 Alexandros Stamatakis
License: GPL-2+
Comment: While the source tarball contains a copy o GPL-3+ the
- sources say GPL-2+ so this version was choosen here.
+ sources say GPL-2+ so this version was chosen here.
Files: debian/*
Copyright: 2017 Andreas Tille <tille at debian.org>
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..378dca0
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,4 @@
+manual/ExaML.odt
+manual/ExaML.pdf
+README.md
+codeDocumentation
diff --git a/debian/install b/debian/install
index a3083b5..7f5a4c7 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
-examl/examl usr/lib/examl/bin
-examl/examl-* usr/lib/examl/bin
-debian/bin usr
-
+examl/examl usr/lib/examl/bin
+examl/examl-* usr/lib/examl/bin
+debian/bin usr
+parser/parse-examl usr/bin
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..97c82a2
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,125 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 14 Feb 2017 17:37:55 +0100
+Description: Enable propagation of hardening options
+
+--- a/examl/Makefile.AVX.gcc
++++ b/examl/Makefile.AVX.gcc
+@@ -8,7 +8,7 @@ COMMON_FLAGS = -D__SIM_SSE3 -D__AVX -D_O
+ OPT_FLAG_1 = -O1
+ OPT_FLAG_2 = -O2
+
+-CFLAGS = $(COMMON_FLAGS) $(OPT_FLAG_2)
++CFLAGS += $(COMMON_FLAGS) $(OPT_FLAG_2)
+
+ LIBRARIES = -lm -mavx
+
+@@ -21,7 +21,7 @@ all : clean examl-AVX
+ GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
+
+ examl-AVX : $(objs)
+- $(CC) -o examl-AVX $(objs) $(LIBRARIES)
++ $(CC) -o examl-AVX $(objs) $(LIBRARIES) $(LDFLAGS)
+
+ avxLikelihood.o : avxLikelihood.c $(GLOBAL_DEPS)
+ $(CC) $(CFLAGS) -mavx -c -o avxLikelihood.o avxLikelihood.c
+@@ -51,4 +51,4 @@ communication.o : communication.c $(GLOB
+ clean :
+ $(RM) *.o examl-AVX
+
+-dev : examl-AVX
+\ No newline at end of file
++dev : examl-AVX
+--- a/examl/Makefile.OMP.AVX.gcc
++++ b/examl/Makefile.OMP.AVX.gcc
+@@ -8,7 +8,7 @@ COMMON_FLAGS = -D__SIM_SSE3 -D__AVX -D_U
+ OPT_FLAG_1 = -O1
+ OPT_FLAG_2 = -O2
+
+-CFLAGS = $(COMMON_FLAGS) $(OPT_FLAG_2)
++CFLAGS += $(COMMON_FLAGS) $(OPT_FLAG_2)
+
+ LIBRARIES = -lm -mavx -fopenmp
+
+@@ -21,7 +21,7 @@ all : clean examl-OMP-AVX
+ GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
+
+ examl-OMP-AVX : $(objs)
+- $(CC) -o examl-OMP-AVX $(objs) $(LIBRARIES)
++ $(CC) -o examl-OMP-AVX $(objs) $(LIBRARIES) $(LDFLAGS)
+
+ avxLikelihood.o : avxLikelihood.c $(GLOBAL_DEPS)
+ $(CC) $(CFLAGS) -mavx -c -o avxLikelihood.o avxLikelihood.c
+--- a/examl/Makefile.OMP.SSE3.gcc
++++ b/examl/Makefile.OMP.SSE3.gcc
+@@ -8,7 +8,7 @@ COMMON_FLAGS = -D_USE_OMP -fopenmp -D_GN
+ OPT_FLAG_1 = -O1
+ OPT_FLAG_2 = -O2
+
+-CFLAGS = $(COMMON_FLAGS) $(OPT_FLAG_2)
++CFLAGS += $(COMMON_FLAGS) $(OPT_FLAG_2)
+
+ LIBRARIES = -lm -fopenmp
+
+@@ -21,7 +21,7 @@ all : clean examl-OMP
+ GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
+
+ examl-OMP : $(objs)
+- $(CC) -o examl-OMP $(objs) $(LIBRARIES)
++ $(CC) -o examl-OMP $(objs) $(LIBRARIES) $(LDFLAGS)
+
+ models.o : models.c $(GLOBAL_DEPS)
+ $(CC) $(COMMON_FLAGS) $(OPT_FLAG_1) -c -o models.o models.c
+--- a/examl/Makefile.SSE3.gcc
++++ b/examl/Makefile.SSE3.gcc
+@@ -9,7 +9,7 @@ COMMON_FLAGS = -D_GNU_SOURCE -D__SIM_SSE
+ OPT_FLAG_1 = -O1
+ OPT_FLAG_2 = -O2
+
+-CFLAGS = $(COMMON_FLAGS) $(OPT_FLAG_2)
++CFLAGS += $(COMMON_FLAGS) $(OPT_FLAG_2)
+
+ LIBRARIES = -lm
+
+@@ -22,7 +22,7 @@ all : clean examl
+ GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
+
+ examl : $(objs)
+- $(CC) -o examl $(objs) $(LIBRARIES)
++ $(CC) -o examl $(objs) $(LIBRARIES) $(LDFLAGS)
+
+ models.o : models.c $(GLOBAL_DEPS)
+ $(CC) $(COMMON_FLAGS) $(OPT_FLAG_1) -c -o models.o models.c
+@@ -49,4 +49,4 @@ quartets.o : quartets.c $(GLOBAL_DEPS)
+ clean :
+ $(RM) *.o examl
+
+-dev : examl
+\ No newline at end of file
++dev : examl
+--- a/parser/Makefile.SSE3.gcc
++++ b/parser/Makefile.SSE3.gcc
+@@ -2,7 +2,7 @@
+ # Makefile cleanup October 2006, Courtesy of Peter Cordes <peter at cordes.ca>
+
+ CC = gcc
+-CFLAGS = -fomit-frame-pointer -O2 -D_GNU_SOURCE -msse -funroll-loops #-Wall -Wunused-parameter -Wredundant-decls -Wreturn-type -Wswitch-default -Wunused-value -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wimport -Wunused -Wunused-function -Wunused-label -Wno-int-to-pointer-cast -Wbad-function-cast -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wstrict-prototypes -Wpointer-sign -Wextra -Wredundant-decls -Wunused -Wunused-fu [...]
++CFLAGS += -fomit-frame-pointer -O2 -D_GNU_SOURCE -msse -funroll-loops -Wall -Wunused-parameter -Wredundant-decls -Wreturn-type -Wswitch-default -Wunused-value -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wimport -Wunused -Wunused-function -Wunused-label -Wno-int-to-pointer-cast -Wbad-function-cast -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wstrict-prototypes -Wpointer-sign -Wextra -Wredundant-decls -Wunused -Wunused-fu [...]
+
+
+ LIBRARIES = -lm
+@@ -16,7 +16,7 @@ all : clean parse-examl
+ GLOBAL_DEPS = axml.h globalVariables.h ../versionHeader/version.h
+
+ parse-examl : $(objs)
+- $(CC) -o parse-examl $(objs) $(LIBRARIES)
++ $(CC) -o parse-examl $(objs) $(LIBRARIES) $(LDFLAGS)
+
+
+ axml.o : axml.c $(GLOBAL_DEPS)
+@@ -26,4 +26,4 @@ clean :
+ $(RM) *.o parse-examl
+
+
+-dev : parse-examl
+\ No newline at end of file
++dev : parse-examl
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..814900f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+hardening.patch
diff --git a/debian/rules b/debian/rules
index 5d83874..84fa450 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,9 @@ SRCDIR:=examl
override_dh_auto_clean:
dh_auto_clean
for mfile in $(MFILES); do $(MAKE) --directory=$(SRCDIR) -f $${mfile} clean ; done
+ $(MAKE) --directory=parser -f Makefile.SSE3.gcc clean ; done
override_dh_auto_build:
dh_auto_build
for mfile in $(MFILES); do $(MAKE) --directory=$(SRCDIR) -f $${mfile} ; done
+ $(MAKE) --directory=parser -f Makefile.SSE3.gcc ; done
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/examl.git
More information about the debian-med-commit
mailing list