debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix hardening build

Browse source 
* debian/control:
  - replace hardening-includes build-dep by hardening-wrapper.
* debian/rules:
  - enable hardening.
* Non-maintainer upload.
This commit is contained in:
Yves-Alexis Perez 2011-02-04 00:06:57 +01:00
parent 5b7fa0d438
commit 46f6082efd
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
debian/changelog vendored
View file

@ -1,3 +1,13 @@
midori (0.3.0-1.2) unstable; urgency=low
* Non-maintainer upload.
* debian/control:
- replace hardening-includes build-dep by hardening-wrapper.
* debian/rules:
- enable hardening.
-- Yves-Alexis Perez <corsac@debian.org> Thu, 03 Feb 2011 23:43:07 +0100
midori (0.3.0-1.2) unstable; urgency=low midori (0.3.0-1.2) unstable; urgency=low
* Non-maintainer upload. * Non-maintainer upload.

2
debian/control vendored
View file

@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 7.0.50),
xvfb, xvfb,
xauth, xauth,
xfonts-base, xfonts-base,
hardening-includes, hardening-wrapper,
libxss-dev libxss-dev
# Disabled optional dependencies: # Disabled optional dependencies:
Build-Conflicts: gtk-doc-tools, Build-Conflicts: gtk-doc-tools,

14
debian/rules vendored
View file

@ -2,13 +2,13 @@
LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
CFLAGS=$(shell dpkg-buildflags --get CFLAGS) CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
CFLAGS+=$(HARDENING_CFLAGS) LDFLAGS+=-Wl,--as-needed -Wl,-O1
#LDFLAGS+=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 $(HARDENING_LDFLAGS)
LDFLAGS+=-Wl,--as-needed -Wl,-O1 $(HARDENING_LDFLAGS)
# waf, thank you _so_ much # waf, thank you _so_ much
CCFLAGS=$(CFLAGS) export LINKFLAGS=$(LDFLAGS)
LINKFLAGS=$(LDFLAGS) export CCFLAGS=$(CFLAGS)
export DEB_BUILD_HARDENING=1
CMD=$(shell echo $@ | sed 's/override_//') CMD=$(shell echo $@ | sed 's/override_//')
@ -44,10 +44,10 @@ override_dh_auto_clean:
rm -rf .lock-wscript rm -rf .lock-wscript
override_dh_auto_configure: override_dh_auto_configure:
$(WAF) --nocache configure --prefix /usr $(WAF) --nocache configure --debug-level=none --prefix /usr
override_dh_auto_build: override_dh_auto_build:
$(WAF) build --nocache --debug full $(WAF) build --nocache -v
#override_dh_auto_test: #override_dh_auto_test:
# xvfb-run $(WAF) --nocache check # xvfb-run $(WAF) --nocache check