Hi!

I just got bit by the lack of multiarch here (wine is broken on amd64 if
nvidia is involved), and wrote a multiarchification patch before realizing
there's already one here.  It's redundant, except for one bit: since an
upload is needed anyway, you could just as well add the hardening flags
(another release goal).  It's a trivial change, but "git am" is still faster
than doing that yourself...

(attached)

-- 
Copyright and patents were never about promoting culture and innovations;
from the very start they were legalized bribes to give the king some income
and to let businesses get rid of competition.  For some history, please read
https://en.wikipedia.org/wiki/Statute_of_Monopolies_1623
From 3c4c72a1e62212952ce09834c1dd09ae9a02383e Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilob...@angband.pl>
Date: Sat, 18 Aug 2012 03:55:26 +0200
Subject: [PATCH] Enable hardening flags.

---
 debian/rules |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4ec442c..3900c51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,10 @@ PACKAGE = libxvmc1
 
 include debian/xsfbs/xsfbs.mk
 
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
@@ -43,7 +41,8 @@ build-stamp:
 	             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	             --sysconfdir=/etc --mandir=\$${prefix}/share/man \
 	             --infodir=\$${prefix}/share/info $(confflags) \
-	             CFLAGS="$(CFLAGS)" 
+	             CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+	             LDFLAGS="$(LDFLAGS)"
 	cd build && $(MAKE)
 	>$@
 
-- 
1.7.10.4

Attachment: signature.asc
Description: Digital signature

Reply via email to