[Pkg-openldap-devel] Bug#724518: openldap: Patch to allow bootstrapping without heimdal-dev

[Ryan Tandy]

Hi Daniel,

Sorry for not responding to this in so long.

On Tue, Sep 24, 2013 at 09:31:36AM -0700, Daniel Schepler wrote:
>During bootstrapping, I need to break the Build-Depends cycle openldap ->
>heimdal-dev -> libldap2-dev.  The attached patch allows this.

Thanks for the patch! Comments below.

>(There's also a small part that's not qualified by ifeq 
>($(DEB_BUILD_PROFILE),stage1) as it seems like a minor bug to me that 
>the build process depends on the previous shlibs file for 
>libldap-2.4-2.)

Reported separately as #742841, fixed in 2.4.40-1.

>+ifeq ($(DEB_BUILD_PROFILE),stage1)

In the time since your original message, it looks like this was renamed 
to DEB_BUILD_PROFILES (plural).

I guess we should also use 'filter' (as in the wiki example), in case 
multiple profiles (not just 'stage1') are active?

>+DH_PACKAGE_EXCLUDES = -Nslapd-smbk5pwd

I don't think this is necessary. The Heimdal support in smbk5pwd is not 
mandatory; we just have to build it with DO_KRB5 undefined, and suppress 
linking against the Heimdal libs somehow.

>+ifneq ($(DEB_BUILD_PROFILE),stage1)
> 	$(MAKE) -C contrib/slapd-modules/smbk5pwd
>+endif

So maybe:

	$(MAKE) -C contrib/slapd-modules/smbk5pwd DEFS='-DDO_SAMBA -DDO_SHADOW'

HEIMDAL_{INC,LIB} are already empty since krb5-config.heimdal is not 
available, and the error from missing it is apparently not fatal.

I think we also want a debian/control hunk, right? Is the build-profiles 
syntax supported for uploading to the archive these days?

What do you think about the attached patch?

thanks,
Ryan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Build-stage1-profile-without-Heimdal-724518.patch
Type: text/x-diff
Size: 1484 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-openldap-devel/attachments/20150825/4dc418b8/attachment.patch>