Commit 5db40de3 authored by Paul Martin's avatar Paul Martin Committed by Michael Jeanson

Import Debian changes 1.16-5

popt (1.16-5) unstable; urgency=low

  * Enabled hardened build flags. (Closes: #672835)
parent 1ab45f24
popt (1.16-5) unstable; urgency=low
* Enabled hardened build flags. (Closes: #672835)
-- Paul Martin <pm@debian.org> Mon, 14 May 2012 11:23:52 +0100
popt (1.16-4) unstable; urgency=low
* Multiarch build cleanup take 2. (Closes: #670022)
......
......@@ -29,12 +29,10 @@ version = 1.7-4
endif
endif
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
cflags = -O0 -Wall -W -g -D_GNU_SOURCE -D_REENTRANT
else
cflags = -O2 -Wall -W -g -D_GNU_SOURCE -D_REENTRANT
endif
cflags = `dpkg-buildflags --get CFLAGS` `dpkg-buildflags --get CPPFLAGS`
cflags += -Wall -W -D_GNU_SOURCE -D_REENTRANT
cflags_udeb = -Os -Wall -W -g -D_GNU_SOURCE -D_REENTRANT
ldflags = `dpkg-buildflags --get LDFLAGS`
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
install = install
......@@ -72,7 +70,7 @@ build-stamp: build-arch-deb-stamp build-arch-udeb-stamp
build-arch-deb-stamp: configure-deb-stamp
dh_testdir
cd $(objdir) && $(MAKE) CFLAGS="$(cflags)"
cd $(objdir) && $(MAKE) CFLAGS="$(cflags)" LDFLAGS="$(ldflags)"
touch $@
build-arch-udeb-stamp: configure-udeb-stamp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment