[med-svn] [ray] 02/02: Add patch to 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 ray.

commit 8871fc7701cc1064044e83e740123db56659d998
Author: Andreas Tille <tille at debian.org>
Date:   Wed Feb 5 10:47:06 2014 +0100

    Add patch to propagate hardening options
---
 debian/changelog               |  1 +
 debian/patches/hardening.patch | 15 +++++++++++++++
 debian/patches/series          |  1 +
 debian/rules                   |  2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cbbe60d..9fdcac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ray (2.3.0-1) UNRELEASED; urgency=low
   * debian/watch: More precise regexp to fit also historic versions
   * debian/upstream: publication information
   * debian/Ray.1: Enhanced formatting
+  * debian/patches/hardening.patch: Propagate hardening options
 
  -- Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>  Mon, 3 Feb 2014 13:17:00 -0500
 
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..63ea350
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org
+Last-Update: Wed, 5 Feb 2014 11:17:00 -0100
+Description: Propagate hardening options
+
+--- a/Makefile
++++ b/Makefile
+@@ -145,7 +145,7 @@ CONFIG_FLAGS-y += -D CONFIG_RAY_VERSION=
+ 
+ # CONFIG_FLAGS is separate from CXXFLAGS
+ # This eases building the package in distributions
+-LDFLAGS = $(LDFLAGS-y)
++LDFLAGS = $(LDFLAGS-y) $(DEBLDFLAGS)
+ CONFIG_FLAGS=$(CONFIG_FLAGS-y)
+ 
+ Q=@
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 2f644d3..e06c820 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ override_dh_auto_clean :
 	rm -f README.Ray  README.RayPlatform
 
 override_dh_auto_build :
-	dh_auto_build -- CXXFLAGS="$(CXXFLAGS)" HAVE_LIBBZ2=y HAVE_LIBZ=y
+	dh_auto_build -- CXXFLAGS="$(CXXFLAGS)" DEBLDFLAGS="$(LDFLAGS)" HAVE_LIBBZ2=y HAVE_LIBZ=y
 	#Rename 2 docs to make more sence in package context
 	cp README.md README.Ray
 	cp RayPlatform/README.md README.RayPlatform

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