diff options
| author | antoine <antoine@FreeBSD.org> | 2015-09-10 20:47:58 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2015-09-10 20:47:58 +0800 |
| commit | 5c96333f47bfbda698060b16940ee4cd6fa1192d (patch) | |
| tree | 66d3aeb3a84aed4b463add66712daaad8ba8e670 /Mk | |
| parent | 882e440d069ac3710cad9069aa650025176107fc (diff) | |
| download | freebsd-ports-gnome-5c96333f47bfbda698060b16940ee4cd6fa1192d.tar.gz freebsd-ports-gnome-5c96333f47bfbda698060b16940ee4cd6fa1192d.tar.zst freebsd-ports-gnome-5c96333f47bfbda698060b16940ee4cd6fa1192d.zip | |
Back-out r396454, it's broken on freebsd 9.3 (breaks at least ftp/curl)
With hat: portmgr
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/gssapi.mk | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk index 3312a61e183b..5f33baebbe64 100644 --- a/Mk/Uses/gssapi.mk +++ b/Mk/Uses/gssapi.mk @@ -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: [${_local}] specified .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}" |