Date: Fri, 18 Sep 2015 21:02:21 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397294 - head/Mk/Uses Message-ID: <201509182102.t8IL2LHq074039@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Fri Sep 18 21:02:21 2015 New Revision: 397294 URL: https://svnweb.freebsd.org/changeset/ports/397294 Log: Add a fixup for broken krb5-config script included in 9.X and some 10.X releases. Modified: head/Mk/Uses/gssapi.mk Modified: head/Mk/Uses/gssapi.mk ============================================================================== --- head/Mk/Uses/gssapi.mk Fri Sep 18 20:40:04 2015 (r397293) +++ head/Mk/Uses/gssapi.mk Fri Sep 18 21:02:21 2015 (r397294) @@ -79,6 +79,7 @@ _HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssa _MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:${PORTSDIR}/security/krb5 _HEADERS= sys/types.h sys/stat.h stdint.h +.undef _FIXUP_KRB5CONFIG .if empty(gssapi_ARGS) gssapi_ARGS= base .endif @@ -93,6 +94,9 @@ _HEADERS+= gssapi/gssapi.h gssapi/gssapi GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" +.if empty(OSREL:N9.*:N10.0]) +_FIXUP_KRB5CONFIG= yes +.endif .elif ${_local} == "heimdal" HEIMDAL_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${HEIMDAL_HOME} @@ -134,7 +138,18 @@ IGNORE= USES=gssapi - invalid args: [${_ .endif .endfor +# Fix up krb5-config if broken. This script included in 9.X prior to +# r271474 and in 10.X prior to r271473 are broken because +# libgssapi_krb5 for some interfaces of GSS-API is missing. +.if defined(_FIXUP_KRB5CONFIG) +KRB5CONFIG=${WRKDIR}/krb5-config +krb5config-fix:: + ${SED} -e 's,\$$lib_flags -lgssapi -lheimntlm,\$$lib_flags -lgssapi -lgssapi_krb5 -lheimntlm,' < ${GSSAPIBASEDIR}/bin/krb5-config > ${KRB5CONFIG} + ${CHMOD} a+rx ${KRB5CONFIG} +pre-configure: krb5config-fix +.else KRB5CONFIG=${GSSAPIBASEDIR}/bin/krb5-config +.endif # Fix up -Wl,-rpath in LDFLAGS .if defined(_RPATH) && !empty(_RPATH)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509182102.t8IL2LHq074039>