Drop hardening-wrapper, use dpkg-buildflags instead
This commit is contained in:
parent
8401f27d3f
commit
093d9a4707
1
debian/control
vendored
1
debian/control
vendored
|
@ -5,7 +5,6 @@ Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian
|
||||||
Uploaders: Jan Wagner <waja@cyconet.org>, Alexander Wirt <formorer@debian.org>
|
Uploaders: Jan Wagner <waja@cyconet.org>, Alexander Wirt <formorer@debian.org>
|
||||||
Build-Depends: autotools-dev,
|
Build-Depends: autotools-dev,
|
||||||
debhelper (>= 5),
|
debhelper (>= 5),
|
||||||
hardening-wrapper,
|
|
||||||
libdbi-dev,
|
libdbi-dev,
|
||||||
libfreeradius-client-dev | libradiusclient-ng-dev,
|
libfreeradius-client-dev | libradiusclient-ng-dev,
|
||||||
libkrb5-dev,
|
libkrb5-dev,
|
||||||
|
|
8
debian/rules
vendored
8
debian/rules
vendored
|
@ -6,8 +6,9 @@
|
||||||
# Uncomment this to turn on verbose mode.
|
# Uncomment this to turn on verbose mode.
|
||||||
#export DH_VERBOSE=1
|
#export DH_VERBOSE=1
|
||||||
|
|
||||||
# enable hardnening
|
# for hardening
|
||||||
export DEB_BUILD_HARDENING=1
|
DPKG_EXPORT_BUILDFLAGS = 1
|
||||||
|
include /usr/share/dpkg/buildflags.mk
|
||||||
|
|
||||||
PACKAGE = monitoring-plugins
|
PACKAGE = monitoring-plugins
|
||||||
|
|
||||||
|
@ -79,8 +80,9 @@ config.status: configure
|
||||||
rm -f config.cache
|
rm -f config.cache
|
||||||
|
|
||||||
# Add here commands to configure the package.
|
# Add here commands to configure the package.
|
||||||
|
# Append 'All warnings', 'Immediate binding' and dpkg-buildflags flags
|
||||||
|
CFLAGS="$$(DEB_CFLAGS_MAINT_APPEND='-Wall -Wl,-z,now' dpkg-buildflags --get CFLAGS)" \
|
||||||
PGINCLUDE="-I`pg_config --includedir`" PGLIBS="-lpq -lcrypt" \
|
PGINCLUDE="-I`pg_config --includedir`" PGLIBS="-lpq -lcrypt" \
|
||||||
CFLAGS="$(CFLAGS)" \
|
|
||||||
./configure \
|
./configure \
|
||||||
--disable-maintainer-mode \
|
--disable-maintainer-mode \
|
||||||
--host=$(DEB_HOST_GNU_TYPE) \
|
--host=$(DEB_HOST_GNU_TYPE) \
|
||||||
|
|
Loading…
Reference in a new issue