Re: mit-krb5/builtin.mk problems on solaris

[Jörn Clausen <joernc%googlemail.com@localhost>]

For the record: To use builtin mit-krb5 on Solaris 10, I had to
(re)apply the following changes:

--- builtin.mk  2013/10/25 12:27:51     1.1
+++ builtin.mk  2013/10/25 12:28:14
@@ -39,7 +39,7 @@
     !empty(IS_BUILTIN.mit-krb5:M[yY][eE][sS])
 .  if empty(SH_KRB5_CONFIG:M__nonexistent__)
 BUILTIN_VERSION.mit-krb5!=     ${SH_KRB5_CONFIG} --version | \
-                               ${SED} -e 's/.*release //' -e 's/-.*//'
+                               ${SED} -e 's/.*release \([0-9\.]*\).*/\1/'
 .  endif
 BUILTIN_VERSION.mit-krb5?=     1.4.0
 BUILTIN_PKG.mit-krb5=          mit-krb5-${BUILTIN_VERSION.mit-krb5}


--- buildlink3.mk       2013/10/25 12:30:41     1.1
+++ buildlink3.mk       2013/10/25 12:35:58
@@ -5,7 +5,7 @@
 .if !defined(MIT_KRB5_BUILDLINK3_MK)
 MIT_KRB5_BUILDLINK3_MK:=

-BUILDLINK_API_DEPENDS.mit-krb5+=       mit-krb5>=1.4nb1
+BUILDLINK_API_DEPENDS.mit-krb5+=       mit-krb5>=1.4
 BUILDLINK_PKGSRCDIR.mit-krb5?=         ../../security/mit-krb5
 .endif # MIT_KRB5_BUILDLINK3_MK


The first change is necessary, because "krb5-config" returns

Solaris Kerberos (based on MIT Kerberos 5 release 1.4.0)

and the original regex keeps the closing parenthesis. I'm not sure
about the second change, but without it, other packages trigger a
build of mit-krb5 instead of using the native version.


On Thu, Oct 17, 2013 at 6:28 AM, Richard PALO <richard.palo%free.fr@localhost> 
wrote:
> Looking again at potential ommissions in mit-krb5/builtin.mk after the
> revert in devel/scmcvs, perhaps more setup can be done...
>
> I'm uncertain about the LDFLAGS, because the gssapi linkage via mit-krb5
> seems a bit undefined...it is okay to presume that it should always be
> present?
>
> although BUILDLINK_INCDIRS doesn't seem to work, the following seems to:
>
>> richard@x3200:~/src/pkgsrc/security/mit-krb5$ git diff .
>> diff --git a/security/mit-krb5/builtin.mk b/security/mit-krb5/builtin.mk
>> index c31837d..aa4f6b2 100644
>> --- a/security/mit-krb5/builtin.mk
>> +++ b/security/mit-krb5/builtin.mk
>> @@ -72,3 +72,22 @@ USE_BUILTIN.mit-krb5!=
>> \
>>  .  endif
>>  .endif
>>  MAKEVARS+=     USE_BUILTIN.mit-krb5
>> +
>> +###
>> +### The section below only applies if we are not including this file
>> +### solely to determine whether a built-in implementation exists.
>> +###
>> +CHECK_BUILTIN.mit-krb5?=       no
>> +.if !empty(CHECK_BUILTIN.mit-krb5:M[nN][oO])
>> +.  if !empty(USE_BUILTIN.mit-krb5:M[yY][eE][sS])
>> +KRB5_CONFIG?=  ${SH_KRB5_CONFIG}
>> +ALL_ENV+=      KRB5_CONFIG=${KRB5_CONFIG:Q}
>> +
>> +BUILDLINK_CPPFLAGS.mit-krb5!=  ${SH_KRB5_CONFIG} --cflags
>> +BUILDLINK_LDFLAGS.mit-krb5!=   ${SH_KRB5_CONFIG} --libs
>> +.    if ${OPSYS} == "SunOS"
>> +BUILDLINK_LDFLAGS.mit-krb5+=   -lgss
>> +.    endif
>> +.  endif
>> +
>> +.endif # CHECK_BUILTIN.mit-krb5
>
>
> I adapted the KRB5_CONFIG part from heimdal which should simplify some of
> the previous commits, for example in gnome-vfs/options.mk...
>
>



-- 
Joern Clausen
http://thebloeg.blogspot.com/
http://www.oe-files.de/photography/