[pkg-ntp-maintainers] Bug#315935: fix FTCBFS in ntp

[Helmut Grohne]

user helmutg at debian.org
usertags 315935 + rebootstrap
tags 315935 + patch
thanks

Please find a patch attached that makes ntp cross build successfully. It
adds --build and --host to configure and ensures that libopts is
available.

Helmut
-------------- next part --------------
diff -Nru ntp-4.2.8p3+dfsg/debian/changelog ntp-4.2.8p3+dfsg/debian/changelog
--- ntp-4.2.8p3+dfsg/debian/changelog	2015-07-25 16:38:32.000000000 +0200
+++ ntp-4.2.8p3+dfsg/debian/changelog	2015-07-30 01:06:41.000000000 +0200
@@ -1,3 +1,13 @@
+ntp (1:4.2.8p3+dfsg-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS. (closes: #-1)
+    + Pass --build and --host to configure.
+    + Missing Build-Depends libopts25-dev (which is not implicit in autogen,
+      because autogen is M-A:foreign).
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 29 Jul 2015 06:22:00 +0200
+
 ntp (1:4.2.8p3+dfsg-1) unstable; urgency=medium
 
   * New upstream version
diff -Nru ntp-4.2.8p3+dfsg/debian/control ntp-4.2.8p3+dfsg/debian/control
--- ntp-4.2.8p3+dfsg/debian/control	2015-02-07 12:27:13.000000000 +0100
+++ ntp-4.2.8p3+dfsg/debian/control	2015-07-30 01:04:21.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian NTP Team <pkg-ntp-maintainers at lists.alioth.debian.org>
 Uploaders: Bdale Garbee <bdale at gag.com>, Peter Eisentraut <petere at debian.org>, Kurt Roeckx <kurt at roeckx.be>
-Build-Depends: dh-autoreconf, debhelper (>= 6), libedit-dev, libcap2-dev [linux-any], libssl-dev (>= 1.0.0e-1), autogen (>= 1:5.11)
+Build-Depends: dh-autoreconf, debhelper (>= 6), libedit-dev, libcap2-dev [linux-any], libssl-dev (>= 1.0.0e-1), autogen (>= 1:5.11), libopts25-dev (>= 1:5.11)
 Build-Conflicts: libavahi-compat-libdnssd-dev, libwww-dev, libwww-ssl-dev
 Standards-Version: 3.9.5
 Homepage: http://support.ntp.org/
diff -Nru ntp-4.2.8p3+dfsg/debian/rules ntp-4.2.8p3+dfsg/debian/rules
--- ntp-4.2.8p3+dfsg/debian/rules	2015-07-25 16:36:54.000000000 +0200
+++ ntp-4.2.8p3+dfsg/debian/rules	2015-07-30 01:22:21.000000000 +0200
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -D_GNU_SOURCE
 CFLAGS   = $(shell dpkg-buildflags --get CFLAGS) -fno-strict-aliasing
@@ -14,6 +16,8 @@
 endif
 	dh_autoreconf
 	./configure CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--host=$(DEB_HOST_GNU_TYPE) \
 		--prefix=/usr \
 		--enable-all-clocks --enable-parse-clocks --enable-SHM \
 		--disable-debugging --sysconfdir=/var/lib/ntp \