sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-06 13:20:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Back-out r396454, it's broken on freebsd 9.3 (breaks at least ftp/curl)

Browse source 
With hat:	portmgr
This commit is contained in:
Antoine Brodin 2015-09-10 12:47:58 +00:00
parent 02c0d75d81
commit 75f5b44ef0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=396567
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Mk/Uses/gssapi.mk
View file

@ -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}"