← Back to branch summary

~ubuntu-branches/ubuntu/trusty/speex/trusty

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Package Import Robot
  • Author(s): Steve Langasek
  • Date: 2014-01-26 09:30:49 UTC
  • mfrom: (5.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20140126093049-gmmhj4tsenomuod2
Tags: 1.2~rc1.1-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Build with float on armhf.
  - Use dh-autoreconf for current libtool.
  - Add build-dependency on pkg-config for the above.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
21
21
 
22
22
HARD_CPPFLAGS = -D_FORTIFY_SOURCE=2
23
23
HARD_CFLAGS   = -Wformat=2
24
 
HARD_LDFLAGS  = -z now
 
24
HARD_LDFLAGS  = -Wl,-z,now
25
25
 
26
 
ifneq (,$(filter-out $(DEB_HOST_ARCH), ia64 alpha mips mipsel hppa arm))
 
26
ifneq (,$(filter-out $(DEB_HOST_ARCH), alpha hppa arm))
27
27
        HARD_CFLAGS += -fstack-protector --param ssp-buffer-size=4
28
28
endif
29
29
ifneq (,$(filter-out $(DEB_HOST_ARCH), ia64 hppa avr32))
30
 
        HARD_LDFLAGS += -z relro
 
30
        HARD_LDFLAGS += -Wl,-z,relro
31
31
endif
32
32
 
33
33
# Keep dpkg-buildpackage the hell out of messing with our compile flags,
79
79
        $(RM) *-stamp
80
80
        $(RM) -r $(all_objs) doc/{html,man,latex}
81
81
        dh_autoreconf_clean
82
 
        dh_autotools-dev_restoreconfig
83
82
        dh_clean
84
83
 
85
84
 
95
94
 
96
95
%/config.status: debian/autoreconf.after configure
97
96
        dh_testdir
98
 
        dh_autotools-dev_updateconfig
99
97
        mkdir -p $*
100
98
        cd $* && ../configure --host=$(DEB_HOST_GNU_TYPE)       \
101
99
                              --build=$(DEB_BUILD_GNU_TYPE)     \