[pkg-ntp-maintainers] Bug#418913: FTBFS on GNU/Hurd

[Barry deFreese]

Package: ntp
Version: 4.2.2.p4+dfsg-2

GNU/Hurd currently doesn't support IPv6 and the linuxcaps is unnecessary 
so had to disable those.  Also we have issues in glibc so we can't build 
ntptime binaries so the build fails when attempting to move that binary.

I am attaching a patch that does allow it to build.  There may be a 
cleaner or more preferred method of doing so.

Thank you,

Barry deFreese (aka bddebian)


-------------- next part --------------
diff -u ntp-4.2.2.p4+dfsg/debian/rules ntp-4.2.2.p4+dfsg/debian/rules
--- ntp-4.2.2.p4+dfsg/debian/rules
+++ ntp-4.2.2.p4+dfsg/debian/rules
@@ -1,7 +1,18 @@
 #!/usr/bin/make -f
 
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
 include /usr/share/quilt/quilt.make
 
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+    EXTRA_CONFIG_OPTS = --enable-ipv6=no --disable-linuxcaps
+    NTP_BINARIES = ntpdate ntp-wait ntpd tickadj ntp-keygen
+else
+    EXTRA_CONFIG_OPTS = --enable-ipv6 --enable-linuxcaps
+    NTP_BINARIES = ntpdate ntp-wait ntpd ntptime tickadj ntp-keygen
+endif
+
+
 # hacks to avoid running these things during the build
 export ACLOCAL    = : aclocal
 export AUTOCONF   = : autoconf
@@ -24,6 +35,7 @@
 		--disable-debugging --sysconfdir=/var/lib/ntp \
 		--with-sntp=no \
 		--enable-linuxcaps \
+		$(EXTRA_CONFIG_OPTS) \
 		--disable-dependency-tracking
 
 build: config build-stamp
@@ -55,7 +67,7 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/ntp
 
 	# move the administrator programs from /usr/bin to /usr/sbin
-	for file in ntpdate ntp-wait ntpd ntptime tickadj ntp-keygen; do \
+	for file in $(NTP_BINARIES); do \
 		mv debian/ntp/usr/bin/$$file debian/ntp/usr/sbin/$$file || exit; \
 	done
 
diff -u ntp-4.2.2.p4+dfsg/debian/changelog ntp-4.2.2.p4+dfsg/debian/changelog
--- ntp-4.2.2.p4+dfsg/debian/changelog
+++ ntp-4.2.2.p4+dfsg/debian/changelog
@@ -1,3 +1,10 @@
+ntp (1:4.2.2.p4+dfsg-2bd1) unstable; urgency=low
+
+  * debian/rules: Disable IPv6 on GNU/Hurd builds
+  * debian/rules: Don't install ntptime on GNU/Hurd
+
+ -- Barry deFreese <bddebian at comcast.net>  Thu, 12 Apr 2007 11:12:03 +0000
+
 ntp (1:4.2.2.p4+dfsg-2) unstable; urgency=low
 
   [ Peter Eisentraut ]