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

* debian/rules:

Browse source 
- pick {C,LD}FLAGS from dpkg-buildflags.
  - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
  - add hardening flags to {C,LD}FLAGS.
This commit is contained in:
Yves-Alexis Perez 2010-11-01 21:30:56 +01:00
parent edcc4f09a7
commit a63f1fd6a9
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -3,8 +3,12 @@ midori (0.2.8-1) UNRELEASED; urgency=low
* New upstream release. * New upstream release.
* debian/control: * debian/control:
- add myself to uploaders. - add myself to uploaders.
* debian/rules:
- pick {C,LD}FLAGS from dpkg-buildflags.
- add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
- add hardening flags to {C,LD}FLAGS.
-- Yves-Alexis Perez <corsac@debian.org> Mon, 20 Sep 2010 23:34:56 +0200 -- Yves-Alexis Perez <corsac@debian.org> Mon, 18 Oct 2010 11:26:48 +0200
midori (0.2.7-1.1) unstable; urgency=low midori (0.2.7-1.1) unstable; urgency=low

3
debian/control vendored
View file

@ -25,7 +25,8 @@ Build-Depends: debhelper (>= 7.0.50),
# For testing under xvfb: # For testing under xvfb:
xvfb, xvfb,
xauth, xauth,
xfonts-base xfonts-base,
hardening-includes
# Disabled optional dependencies: # Disabled optional dependencies:
Build-Conflicts: gtk-doc-tools, Build-Conflicts: gtk-doc-tools,
libgtksourceview2.0-dev (>= 2.0), libgtksourceview2.0-dev (>= 2.0),

12
debian/rules vendored
View file

@ -1,5 +1,15 @@
#!/usr/bin/make -f #!/usr/bin/make -f
LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
CFLAGS+=$(HARDENING_CFLAGS)
#LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
LDFLAGS+=-Wl,--as-needed $(HARDENING_LDFLAGS)
# waf, thank you _so_ much
CCFLAGS=$(CFLAGS)
LINKFLAGS=$(LDFLAGS)
CMD=$(shell echo $@ | sed 's/override_//') CMD=$(shell echo $@ | sed 's/override_//')
LIBWEBKIT_PKG=$(shell dpkg-query -p libwebkit-dev | grep Depends | sed -r 's/.*(libwebkit[^ ]+).*/\1/') LIBWEBKIT_PKG=$(shell dpkg-query -p libwebkit-dev | grep Depends | sed -r 's/.*(libwebkit[^ ]+).*/\1/')
@ -45,7 +55,7 @@ override_dh_auto_configure: $(WAFADMIN_FILE)
$(WAF) --nocache configure --prefix /usr $(WAF) --nocache configure --prefix /usr
override_dh_auto_build: $(WAFADMIN_FILE) override_dh_auto_build: $(WAFADMIN_FILE)
$(WAF) --nocache build --debug full $(WAF) build --nocache --debug full
#override_dh_auto_test: $(WAFADMIN_FILE) #override_dh_auto_test: $(WAFADMIN_FILE)
# xvfb-run $(WAF) --nocache check # xvfb-run $(WAF) --nocache check