[Pkg-urxvt-maintainers] [SCM] Git repository for pkg-urxvt branch, master, updated. debian/9.15-1-4-gf030263

[Ryan Kavanagh]

Gitweb-URL: http://git.debian.org/?p=pkg-kde//srv/git.debian.org/git/pkg-urxvt/pkg-urxvt.git;a=commitdiff;h=908871e

The following commit has been merged in the master branch:
commit 908871ee618b645b72e0e2bb72e541d16c60e9a1
Author: Ryan Kavanagh <rak at debian.org>
Date:   Fri Jun 29 10:34:26 2012 -0400

    Use hardening build flags via dpkg-buildflags
---
 debian/rules |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 62b65c4..75abab0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,11 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CXXFLAGS = -Wall -g
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CXXFLAGS += -O0
 else
@@ -34,11 +38,17 @@ cfgcommon = \
     --enable-wtmp \
     --enable-lastlog
 
+flagscommon = \
+    CPPFLAGS="$(CPPFLAGS)" \
+    CFLAGS="$(CFLAGS)" \
+    CXXFLAGS="$(CXXFLAGS)" \
+    LDFLAGS="$(LDFLAGS)"
+
 config.status: configure
 	dh_autotools-dev_updateconfig
 
 conf-unicode:
-	CXXFLAGS="$(CXXFLAGS)" ./configure $(cfgcommon) \
+	$(flagscommon) ./configure $(cfgcommon) \
 	    --enable-unicode3 \
 	    --enable-combining \
 	    --enable-xft \
@@ -59,7 +69,7 @@ conf-unicode:
 	    --with-term=rxvt-unicode
 
 conf-unicode-256color:
-	CXXFLAGS="$(CXXFLAGS)" ./configure $(cfgcommon) \
+	$(flagscommon) ./configure $(cfgcommon) \
 	    --enable-unicode3 \
 	    --enable-combining \
 	    --enable-xft \
@@ -81,7 +91,7 @@ conf-unicode-256color:
 	    --with-term=rxvt-unicode-256color
 
 conf-unicode-lite:
-	CXXFLAGS="$(CXXFLAGS)" ./configure $(cfgcommon) \
+	$(flagscommon) ./configure $(cfgcommon) \
 	    --disable-xft \
 	    --disable-pixbuf\
 	    --disable-perl \

-- 
Git repository for pkg-urxvt