Date: Wed, 9 Sep 2015 08:03:32 +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: r396454 - head/Mk/Uses Message-ID: <201509090803.t8983Wm3066573@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Wed Sep 9 08:03:31 2015 New Revision: 396454 URL: https://svnweb.freebsd.org/changeset/ports/396454 Log: - Add KRB5CONFIG. - Use more complete library lists in GSSAPILIBS. Modified: head/Mk/Uses/gssapi.mk Modified: head/Mk/Uses/gssapi.mk ============================================================================== --- head/Mk/Uses/gssapi.mk Wed Sep 9 08:01:00 2015 (r396453) +++ head/Mk/Uses/gssapi.mk Wed Sep 9 08:03:31 2015 (r396454) @@ -24,6 +24,7 @@ # GSSAPILIBDIR # GSSAPILIBS # GSSAPI_CONFIGURE_ARGS +# KRB5CONFIG # # Affected variables: # PREFIX (bootstrap) @@ -90,7 +91,9 @@ GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib GSSAPIINCDIR= ${GSSAPIBASEDIR}/include _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" -GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 +GSSAPILIBS= -lgssapi -lgssapi_krb5 -lheimntlm -lkrb5 -lhx509 \ + -lcom_err -lcrypto -lasn1 -lwind -lheimbase -lroken \ + -lcrypt -pthread GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" .elif ${_local} == "heimdal" HEIMDAL_HOME?= ${LOCALBASE} @@ -105,7 +108,10 @@ RUN_DEPENDS+= ${_HEIMDAL_DEPENDS} PREFIX= ${HEIMDAL_HOME} .endif GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" -GSSAPILIBS= -lkrb5 -lgssapi +GSSAPILIBS= -lgssapi -lheimntlm -lkrb5 -lhx509 \ + -lcom_err -lcrypto -lasn1 -lwind -lheimbase -lroken \ + -lcrypt -pthread +GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" _RPATH= ${GSSAPILIBDIR} .elif ${_local} == "mit" @@ -120,7 +126,7 @@ RUN_DEPENDS+= ${_MITKRB5_DEPENDS} .else PREFIX= ${KRB5_HOME} .endif -GSSAPILIBS= -lkrb5 -lgssapi_krb5 +GSSAPILIBS= -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" _RPATH= ${GSSAPILIBDIR} @@ -133,6 +139,8 @@ 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,*) @@ -153,7 +161,8 @@ LDADD+= ${GSSAPILIBS} GSSAPI_CONFIGURE_ARGS= \ CFLAGS="${GSSAPICPPFLAGS} ${CFLAGS}" \ LDFLAGS="${GSSAPILDFLAGS} ${LDFLAGS}" \ - LIBS="${GSSAPILIBS} ${LIBS}" + LIBS="${GSSAPILIBS} ${LIBS}" \ + KRB5CONFIG="${KRB5CONFIG}" debug-krb: @(for I in ${_HEADERS}; do echo "#include <$$I>"; done; \ @@ -174,6 +183,7 @@ 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?201509090803.t8983Wm3066573>