diff options
| author | Rob Austein <sra@hactrn.net> | 2016-03-19 19:45:04 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-03-19 19:45:04 +0000 |
| commit | 48e1f63e98c715da052364fddbe4d7f29f7bd628 (patch) | |
| tree | d1396d72a8b38d37477320e5a4aaecd27a5f62f3 | |
| parent | 098ba69a98e32171702232ccda5c9bba0d206884 (diff) | |
Specify locations of sudo and rrdtool in Debian build to avoid kludge
of having to include them as build dependencies just so that
./configure can figure out their locations.
svn path=/branches/tk705/; revision=6320
| -rw-r--r-- | buildtools/debian-skeleton/control | 6 | ||||
| -rw-r--r-- | buildtools/debian-skeleton/rules | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/buildtools/debian-skeleton/control b/buildtools/debian-skeleton/control index 94f48d21..f8e1b846 100644 --- a/buildtools/debian-skeleton/control +++ b/buildtools/debian-skeleton/control @@ -5,15 +5,11 @@ # Division between rp and ca packages is somewhat arbitrary, and becomes less relevant as we move more and # more of the code from C into Python. Some day we may just collapse down to a single binary package again. -# Build doesn't really require sudo or rrdtool, but rpki.autoconf gets the wrong values if they're not present. -# Better fix for this would be to specify values for this on the command line for ./configure, but specifying -# them as build dependencies should work around the problem for now. - Source: rpki Section: net Priority: extra Maintainer: Rob Austein <sra@hactrn.net> -Build-Depends: debhelper (>= 8.0.0), autotools-dev, python (>= 2.7), python-all-dev, python-setuptools, python-lxml, sudo, rrdtool +Build-Depends: debhelper (>= 8.0.0), autotools-dev, python (>= 2.7), python-all-dev, python-setuptools, python-lxml Standards-Version: 3.9.3 Homepage: http://trac.rpki.net/ Vcs-Svn: http://subvert-rpki.hactrn.net/ diff --git a/buildtools/debian-skeleton/rules b/buildtools/debian-skeleton/rules index 8e233e08..4849f2de 100644 --- a/buildtools/debian-skeleton/rules +++ b/buildtools/debian-skeleton/rules @@ -10,5 +10,8 @@ export DH_VERBOSE=1 override_dh_auto_configure: dh_auto_configure -- --disable-target-installation --enable-python-install-layout=deb --disable-runtime-dependencies --enable-wsgi-daemon-mode=rpki +override_dh_auto_build: + dh_auto_build -- SUDO=/usr/bin/sudo RRDTOOL=/usr/bin/rrdtool + override_dh_auto_test: @true |