diff options
| author | hrs <hrs@FreeBSD.org> | 2014-11-22 18:51:58 +0800 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2014-11-22 18:51:58 +0800 |
| commit | 7ffdbf3758222b98484c158e3b642050c73d0f61 (patch) | |
| tree | 84e8410fc30de2419c04e8097a73ea9baa40f035 /Mk/Uses | |
| parent | 5718cc32b06390f01f8c15c5873a9909344f8f23 (diff) | |
| download | freebsd-ports-gnome-7ffdbf3758222b98484c158e3b642050c73d0f61.tar.gz freebsd-ports-gnome-7ffdbf3758222b98484c158e3b642050c73d0f61.tar.zst freebsd-ports-gnome-7ffdbf3758222b98484c158e3b642050c73d0f61.zip | |
- Move headers and libraries into PREFIX/{include,lib}/heimdal. This
prevents build breakage when a port depends on heimdal in base and
some other libraries in LOCALBASE/lib such as OpenSSL from ports
at the same time.
- Always build libcom_err[*].
PR: 194475 [*]
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/gssapi.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk index e15ffc33c4f7..2914ee7e7928 100644 --- a/Mk/Uses/gssapi.mk +++ b/Mk/Uses/gssapi.mk @@ -74,9 +74,6 @@ .if !defined(_INCLUDE_USES_GSSAPI_MK) _INCLUDE_USES_GSSAPI_MK= yes -GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib -GSSAPIINCDIR= ${GSSAPIBASEDIR}/include - _HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:${PORTSDIR}/security/heimdal _MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:${PORTSDIR}/security/krb5 _HEADERS= sys/types.h sys/stat.h stdint.h @@ -89,31 +86,35 @@ _local:= ${_A} .if ${_local} == "base" HEIMDAL_HOME= /usr GSSAPIBASEDIR= ${HEIMDAL_HOME} +GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib +GSSAPIINCDIR= ${GSSAPIBASEDIR}/include _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h -GSSAPICPPFLAGS= -I${GSSAPIINCDIR} +GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" .elif ${_local} == "heimdal" HEIMDAL_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${HEIMDAL_HOME} +GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib/heimdal +GSSAPIINCDIR= ${GSSAPIBASEDIR}/include/heimdal +_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h .if !defined(_KRB_BOOTSTRAP) BUILD_DEPENDS+= ${_HEIMDAL_DEPENDS} RUN_DEPENDS+= ${_HEIMDAL_DEPENDS} -_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h .else PREFIX= ${HEIMDAL_HOME} .endif -GSSAPICPPFLAGS= -I${GSSAPIINCDIR} +GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" GSSAPILIBS= -lkrb5 -lgssapi GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" _RPATH= ${GSSAPILIBDIR} .elif ${_local} == "mit" KRB5_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${KRB5_HOME} +_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h .if !defined(_KRB_BOOTSTRAP) BUILD_DEPENDS+= ${_MITKRB5_DEPENDS} RUN_DEPENDS+= ${_MITKRB5_DEPENDS} -_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h .else PREFIX= ${KRB5_HOME} .endif |