This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository grass.
commit e4b4acde2d010224902d690883b17991640587b7 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Thu Aug 21 20:04:46 2014 +0200 Don't use hardening-includes, but dpkg-buildflags only. --- debian/changelog | 1 + debian/control | 3 +-- debian/control.in | 3 +-- debian/rules | 13 +------------ 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 97764ce..cd9c929 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ grass (6.4.4-1) UNRELEASED; urgency=low add ${misc:Depends} for grass, remove obsolete ored build dependencies. * Add myself to Uploaders. * Use {build,install}-arch targets in rules file. + * Don't use hardening-includes, but dpkg-buildflags only. -- M. Hamish Bowman <hamish.webm...@gmail.com> Mon, 11 Aug 2014 18:09:42 +1200 diff --git a/debian/control b/debian/control index b67bc89..20efa68 100644 --- a/debian/control +++ b/debian/control @@ -39,8 +39,7 @@ Build-Depends: autoconf2.13, python-dev, tcl-dev (>= 8.5), tk-dev (>= 8.5), - unixodbc-dev, - hardening-includes + unixodbc-dev Build-Conflicts: wx2.6-headers Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/grass.git diff --git a/debian/control.in b/debian/control.in index 044f8eb..d60bd97 100644 --- a/debian/control.in +++ b/debian/control.in @@ -39,8 +39,7 @@ Build-Depends: autoconf2.13, python-dev, tcl-dev (>= 8.5), tk-dev (>= 8.5), - unixodbc-dev, - hardening-includes + unixodbc-dev Build-Conflicts: wx2.6-headers Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/grass.git diff --git a/debian/rules b/debian/rules index 40023af..5fffdca 100755 --- a/debian/rules +++ b/debian/rules @@ -14,20 +14,9 @@ ABI=$(shell echo `head -3 $(CURDIR)/include/VERSION` | sed -e 's/ //g' -e 's/RC/ BASE_NAME=grass$(VERSION) PKG_NAME=grass -include /usr/share/hardening-includes/hardening.make CFLAGS=$(shell dpkg-buildflags --get CFLAGS) LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -# in Wheezy (and Jessie ia64) -fPIE conflicts with -fPIC. See example in -# the hardening.make file. -ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH_CPU),ia64) - CFLAGS += $(HARDENING_CFLAGS_PIC) \ - $(filter-out $(HARDENING_DISABLE_PIE_CFLAGS_FILTER),$(HARDENING_CFLAGS)) - LDFLAGS+=$(HARDENING_LDFLAGS) -else - # in Jessie & Sid the problem seems fixed so we can proceed normally - CFLAGS+=$(HARDENING_CFLAGS) - LDFLAGS+=$(HARDENING_LDFLAGS) -endif +CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS) # TODO: fix these CFLAGS+=-Wno-error=format-security -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel