diff options
Diffstat (limited to 'Mk/Uses/gssapi.mk')
| -rw-r--r-- | Mk/Uses/gssapi.mk | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk index f1e76ffc40b3..c09051ef2554 100644 --- a/Mk/Uses/gssapi.mk +++ b/Mk/Uses/gssapi.mk @@ -79,7 +79,6 @@ _HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:security/heimdal _MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:security/krb5 _HEADERS= sys/types.h sys/stat.h stdint.h -.undef _FIXUP_KRB5CONFIG .if empty(gssapi_ARGS) gssapi_ARGS= base .endif @@ -97,9 +96,6 @@ _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" -.if empty(OSREL:N9.3) -_FIXUP_KRB5CONFIG= yes -.endif .elif ${_local} == "heimdal" HEIMDAL_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${HEIMDAL_HOME} @@ -141,18 +137,7 @@ IGNORE= USES=gssapi - invalid args: [${_local}] specified .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 -_USES_configure+= 290:krb5config-fix -krb5config-fix: - ${SED} -e 's,\$$lib_flags -lgssapi -lheimntlm,\$$lib_flags -lgssapi -lgssapi_krb5 -lheimntlm,' < ${GSSAPIBASEDIR}/bin/krb5-config > ${KRB5CONFIG} - ${CHMOD} a+rx ${KRB5CONFIG} -.else KRB5CONFIG=${GSSAPIBASEDIR}/bin/krb5-config -.endif # Fix up -Wl,-rpath in LDFLAGS .if defined(_RPATH) && !empty(_RPATH) |