Apply path by Andreas Henriksson to fix usrmerge issue.

Pass PATH_TO_APTGET=/usr/bin/apt-get to configure
- fixes reproducible build on merged-usr vs non-merged systems.
(closes: #914092)
This commit is contained in:
Bas Couwenberg 2018-12-02 09:23:52 +01:00
parent 2949c60e92
commit c70710fc69
2 changed files with 8 additions and 0 deletions

7
debian/changelog vendored
View file

@ -1,6 +1,13 @@
monitoring-plugins (2.2-5) UNRELEASED; urgency=medium monitoring-plugins (2.2-5) UNRELEASED; urgency=medium
[ Bas Couwenberg ]
* Bump Standards-Version to 4.2.1, no changes. * Bump Standards-Version to 4.2.1, no changes.
[ Andreas Henriksson ]
* Pass PATH_TO_APTGET=/usr/bin/apt-get to configure
- fixes reproducible build on merged-usr vs non-merged systems.
(closes: #914092)
* *
-- Jan Wagner <waja@cyconet.org> Sun, 13 May 2018 19:18:00 +0200 -- Jan Wagner <waja@cyconet.org> Sun, 13 May 2018 19:18:00 +0200

1
debian/rules vendored
View file

@ -82,6 +82,7 @@ config.status: configure
# Add here commands to configure the package. # Add here commands to configure the package.
# Append 'All warnings', 'Immediate binding' and dpkg-buildflags flags # Append 'All warnings', 'Immediate binding' and dpkg-buildflags flags
CFLAGS="$$(DEB_CFLAGS_MAINT_APPEND='-Wall -Wl,-z,now' dpkg-buildflags --get CFLAGS)" \ CFLAGS="$$(DEB_CFLAGS_MAINT_APPEND='-Wall -Wl,-z,now' dpkg-buildflags --get CFLAGS)" \
PATH_TO_APTGET=/usr/bin/apt-get \
PGINCLUDE="-I`pg_config --includedir`" PGLIBS="-lpq -lcrypt" \ PGINCLUDE="-I`pg_config --includedir`" PGLIBS="-lpq -lcrypt" \
./configure \ ./configure \
--disable-maintainer-mode \ --disable-maintainer-mode \