~ubuntu-branches/ubuntu/oneiric/dma/oneiric

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Tarun Kumar Mall
  • Date: 2011-03-09 17:46:56 UTC
  • mfrom: (7.2.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110309174656-7s0buxoxvsos8ua1
Tags: 0.0.2010.06.17-10ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Patch 38_fix_ftbfs_binutils-gold.patch imported from previous
    ubuntu version.
  - Patch 38_fix_ftbfs_binutils-gold.patch renamed to
    42_fix_ftbfs_binutils-gold.patch
  - Patch 43_fix_ftbfs_Werror.patch added to fix 
    crypto.c:92:7: error: assignment discards 'const' qualifier 
    from pointer target type [-Werror] "Closes: #622052"

Show diffs side-by-side

added added

removed removed

Lines of Context:
13
13
 
14
14
CONFFILES=      auth.conf dma.conf virtusertable
15
15
 
16
 
ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
 
16
ifeq (,$(filter nowerror,$(DEB_BUILD_OPTIONS)))
17
17
        CFLAGS+=        -Werror
18
18
endif
19
19
ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
20
20
        export STRIPFLAG=
21
21
endif
22
 
ifneq (,$(filter hardening,$(DEB_BUILD_OPTIONS)))
23
 
export DEB_BUILD_HARDENING=1
24
 
else
25
 
export DEB_BUILD_HARDENING=0
 
22
include /usr/share/hardening-includes/hardening.make
 
23
ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS)))
 
24
CFLAGS+=        $(HARDENING_CFLAGS)
 
25
LDFLAGS+=       $(HARDENING_LDFLAGS)
26
26
endif
27
27
 
28
28
export CFLAGS CPPFLAGS LDFLAGS