Author: roam-guest
Date: 2010-12-02 17:48:42 +0000 (Thu, 02 Dec 2010)
New Revision: 11545
Modified:
packages/trunk/xmahjongg/debian/changelog
packages/trunk/xmahjongg/debian/control
packages/trunk/xmahjongg/debian/rules
Log:
Use hardening-includes instead of hardening-wrapper so that
the hardening flags are actually visible.
Modified: packages/trunk/xmahjongg/debian/changelog
===================================================================
--- packages/trunk/xmahjongg/debian/changelog 2010-12-02 17:39:15 UTC (rev
11544)
+++ packages/trunk/xmahjongg/debian/changelog 2010-12-02 17:48:42 UTC (rev
11545)
@@ -14,6 +14,8 @@
CPPFLAGS and LDFLAGS.
* Install the NEWS file as a changelog and remove the Lintian override.
* Remove a trailing space in the 01-autotools patch.
+ * Use the hardening-includes package instead of hardening-wrapper so that
+ the hardening flags are visible in CFLAGS and CXXFLAGS.
-- Peter Pentchev <[email protected]> Mon, 29 Nov 2010 17:18:09 +0200
Modified: packages/trunk/xmahjongg/debian/control
===================================================================
--- packages/trunk/xmahjongg/debian/control 2010-12-02 17:39:15 UTC (rev
11544)
+++ packages/trunk/xmahjongg/debian/control 2010-12-02 17:48:42 UTC (rev
11545)
@@ -5,7 +5,7 @@
Uploaders: Peter Pentchev <[email protected]>
Standards-Version: 3.9.1
Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7~), libx11-dev,
- x11proto-core-dev, hardening-wrapper
+ x11proto-core-dev, hardening-includes
Homepage: http://www.lcdf.org/xmahjongg/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/xmahjongg
Vcs-Browser:
http://svn.debian.org/wsvn/pkg-games/packages/trunk/xmahjongg/?op=log
Modified: packages/trunk/xmahjongg/debian/rules
===================================================================
--- packages/trunk/xmahjongg/debian/rules 2010-12-02 17:39:15 UTC (rev
11544)
+++ packages/trunk/xmahjongg/debian/rules 2010-12-02 17:48:42 UTC (rev
11545)
@@ -13,11 +13,13 @@
CPPFLAGS= $(shell dpkg-buildflags --get CPPFLAGS)
LDFLAGS= $(shell dpkg-buildflags --get LDFLAGS)
+include /usr/share/hardening-includes/hardening.make
ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS)))
-export DEB_BUILD_HARDENING=1
-else
-export DEB_BUILD_HARDENING=0
+CFLAGS+= $(HARDENING_CFLAGS)
+CXXFLAGS+= $(HARDENING_CFLAGS)
+LDFLAGS+= $(HARDENING_LDFLAGS)
endif
+
WARNFLAGS?=
ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
WARNFLAGS+= -Werror
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
