On Tue, Aug 25, 2015 at 11:33 AM, Ryan Tandy <r...@nardis.ca> wrote:
> 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).
>
Yup, so this would be translated to: ifneq (,$(filter
stage1,$(DEB_BUILD_PROFILES)))
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.
>
The new (much simpler) equivalent would be putting "Build-Profiles:
<!stage1>" into the slapd-smbk5pwd debian/control stanza. (I tend to put
it right under the Architecture field.) I would definitely want to exclude
that package from the stage1 profile build as otherwise it might not
provide all expected functionality of the package.
+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 don't see the point in building the addon if it's not going to be
packaged in the stage1 profile anyway - so I would just update to
ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
$(MAKE) -C contrib/slapd-modules/smbk5pwd
endif
I think we also want a debian/control hunk, right? Is the build-profiles
> syntax supported for uploading to the archive these days?
>
Yup, for example nss and util-linux are already using it.
What do you think about the attached patch?
>
I'm at work at the moment so I don't have time to look at it in detail
right now - I'll try to look at it this evening.
--
Daniel
