Date: Thu, 10 Sep 2015 12:47:59 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396567 - head/Mk/Uses Message-ID: <201509101247.t8AClx30085482@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Thu Sep 10 12:47:58 2015 New Revision: 396567 URL: https://svnweb.freebsd.org/changeset/ports/396567 Log: Back-out r396454, it's broken on freebsd 9.3 (breaks at least ftp/curl) With hat: portmgr Modified: head/Mk/Uses/gssapi.mk Modified: head/Mk/Uses/gssapi.mk ============================================================================== --- head/Mk/Uses/gssapi.mk Thu Sep 10 12:26:01 2015 (r396566) +++ head/Mk/Uses/gssapi.mk Thu Sep 10 12:47:58 2015 (r396567) @@ -24,7 +24,6 @@ # GSSAPILIBDIR # GSSAPILIBS # GSSAPI_CONFIGURE_ARGS -# KRB5CONFIG # # Affected variables: # PREFIX (bootstrap) @@ -91,9 +90,7 @@ GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib GSSAPIINCDIR= ${GSSAPIBASEDIR}/include _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" -GSSAPILIBS= -lgssapi -lgssapi_krb5 -lheimntlm -lkrb5 -lhx509 \ - -lcom_err -lcrypto -lasn1 -lwind -lheimbase -lroken \ - -lcrypt -pthread +GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" .elif ${_local} == "heimdal" HEIMDAL_HOME?= ${LOCALBASE} @@ -108,10 +105,7 @@ RUN_DEPENDS+= ${_HEIMDAL_DEPENDS} PREFIX= ${HEIMDAL_HOME} .endif GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" -GSSAPILIBS= -lgssapi -lheimntlm -lkrb5 -lhx509 \ - -lcom_err -lcrypto -lasn1 -lwind -lheimbase -lroken \ - -lcrypt -pthread -GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" +GSSAPILIBS= -lkrb5 -lgssapi GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" _RPATH= ${GSSAPILIBDIR} .elif ${_local} == "mit" @@ -126,7 +120,7 @@ RUN_DEPENDS+= ${_MITKRB5_DEPENDS} .else PREFIX= ${KRB5_HOME} .endif -GSSAPILIBS= -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err +GSSAPILIBS= -lkrb5 -lgssapi_krb5 GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" _RPATH= ${GSSAPILIBDIR} @@ -139,8 +133,6 @@ IGNORE= USES=gssapi - invalid args: [${_ .endif .endfor -KRB5CONFIG=${GSSAPIBASEDIR}/bin/krb5-config - # Fix up -Wl,-rpath in LDFLAGS .if defined(_RPATH) && !empty(_RPATH) .if !empty(LDFLAGS:M-Wl,-rpath,*) @@ -161,8 +153,7 @@ LDADD+= ${GSSAPILIBS} GSSAPI_CONFIGURE_ARGS= \ CFLAGS="${GSSAPICPPFLAGS} ${CFLAGS}" \ LDFLAGS="${GSSAPILDFLAGS} ${LDFLAGS}" \ - LIBS="${GSSAPILIBS} ${LIBS}" \ - KRB5CONFIG="${KRB5CONFIG}" + LIBS="${GSSAPILIBS} ${LIBS}" debug-krb: @(for I in ${_HEADERS}; do echo "#include <$$I>"; done; \ @@ -183,7 +174,6 @@ debug-krb: @echo "GSSAPICPPFLAGS: ${GSSAPICPPFLAGS}" @echo "GSSAPILDFLAGS: ${GSSAPILDFLAGS}" @echo "GSSAPI_CONFIGURE_ARGS: ${GSSAPI_CONFIGURE_ARGS}" - @echo "KRB5CONFIG: ${KRB5CONFIG}" @echo "CFLAGS: ${CFLAGS}" @echo "LDFLAGS: ${LDFLAGS}" @echo "LDADD: ${LDADD}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509101247.t8AClx30085482>