Package: heimdal
Version: 1.6~rc2+dfsg-10
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch
Hi Brian,
In a recent archive rebuild test in Ubuntu, the heimdal package failed to
build on two architectures because of a missing makefile dependency on a
generated file:
Making all in kdc
make[2]: Entering directory '/«BUILDDIR»/heimdal-1.6~rc2+dfsg/kdc'
cd . && perl ../cf/make-proto.pl -q -P comment -o kdc-protos.h default_config.c
set_dbinfo.c digest.c fast.c kdc_locl.h kerberos5.c krb5tgs.c pkinit.c log.c
misc.c kx509.c process.c windc.c rx.h || rm -f kdc-protos.h
cd . && perl ../cf/make-proto.pl -q -P comment -p kdc-private.h
default_config.c set_dbinfo.c digest.c fast.c kdc_locl.h kerberos5.c krb5tgs.c
pkinit.c log.c misc.c kx509.c process.c windc.c rx.h || rm -f kdc-private.h
CC string2key.o
updating kdc-private.h
In file included from headers.h:106:0,
from string2key.c:34:
./kdc.h:111:24: fatal error: kdc-protos.h: No such file or directory
compilation terminated.
Makefile:990: recipe for target 'string2key.o' failed
For a full build log, see:
https://launchpadlibrarian.net/219491823/buildlog_ubuntu-wily-amd64.heimdal_1.6~rc2%2Bdfsg-10_BUILDING.txt.gz
This is the unmodified heimdal package from Debian, so this build failure
will also be intermittently reproducible in Debian.
The attached patch corrects this issue, by making sure the generated header
is built before trying to build the programs that depend on it.
Thanks for considering this patch.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru heimdal-1.6~rc2+dfsg/debian/patches/parallel-build-dependencies heimdal-1.6~rc2+dfsg/debian/patches/parallel-build-dependencies
--- heimdal-1.6~rc2+dfsg/debian/patches/parallel-build-dependencies 1969-12-31 16:00:00.000000000 -0800
+++ heimdal-1.6~rc2+dfsg/debian/patches/parallel-build-dependencies 2015-10-02 17:05:54.000000000 -0700
@@ -0,0 +1,23 @@
+Description: Fix header dependencies for parallel builds
+ The heimdal package builds with dh --parallel, but a header which is
+ generated at build-time is not marked as a dependency of the programs
+ that depend on it for building. Correct this so that parallel builds work
+ reliably.
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+
+Index: heimdal-1.6~rc2+dfsg/kdc/Makefile.am
+===================================================================
+--- heimdal-1.6~rc2+dfsg.orig/kdc/Makefile.am
++++ heimdal-1.6~rc2+dfsg/kdc/Makefile.am
+@@ -19,9 +19,9 @@
+ hprop_SOURCES = hprop.c mit_dump.c hprop.h
+ hpropd_SOURCES = hpropd.c hprop.h
+
+-kstash_SOURCES = kstash.c headers.h
++kstash_SOURCES = kstash.c headers.h $(srcdir)/kdc-protos.h
+
+-string2key_SOURCES = string2key.c headers.h
++string2key_SOURCES = string2key.c headers.h $(srcdir)/kdc-protos.h
+
+ digest_service_SOURCES = \
+ digest-service.c
diff -Nru heimdal-1.6~rc2+dfsg/debian/patches/series heimdal-1.6~rc2+dfsg/debian/patches/series
--- heimdal-1.6~rc2+dfsg/debian/patches/series 2015-04-25 09:34:04.000000000 -0700
+++ heimdal-1.6~rc2+dfsg/debian/patches/series 2015-10-02 16:26:39.000000000 -0700
@@ -20,3 +20,4 @@
050_kadmin_to_usr_bin
051_bug746486-memleak
060_no_build_string
+parallel-build-dependencies
