diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-06-17 18:44:04 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-06-17 18:44:04 +0000 |
| commit | 112ef59b2c47b06cb9579ec19f1f3af47841db89 (patch) | |
| tree | 9441ea28eb25da6977b5b13456ff5e711ee90afc /www | |
| parent | 0685b3e969da31b168fb72e209a44221f69dd984 (diff) | |
| download | ports-112ef59b2c47b06cb9579ec19f1f3af47841db89.tar.gz ports-112ef59b2c47b06cb9579ec19f1f3af47841db89.zip | |
Conditionally add "-lgssapi_krb5" to KRB5_LDFLAGS. This fixes build with
security/heimdal.
PR: ports/124375
Approved by: apache (maintainer, timeout 6+ years)
Notes
Notes:
svn path=/head/; revision=358159
Diffstat (limited to 'www')
| -rw-r--r-- | www/mod_auth_kerb2/Makefile | 4 | ||||
| -rw-r--r-- | www/mod_auth_kerb2/files/patch-Makefile.in | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile index 6c04a6ee7aac..b29206230a33 100644 --- a/www/mod_auth_kerb2/Makefile +++ b/www/mod_auth_kerb2/Makefile @@ -39,6 +39,10 @@ CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} --without-krb4 post-patch: ${REINPLACE_CMD} -e 's|@APXS_STAGE@|-S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR}|' \ ${WRKSRC}/Makefile.in +.if !defined(HEIMDAL_HOME) + ${REINPLACE_CMD} -e 's|@KRB5_LDFLAGS@|@KRB5_LDFLAGS@ -lgssapi_krb5|' \ + ${WRKSRC}/Makefile.in +.endif pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} diff --git a/www/mod_auth_kerb2/files/patch-Makefile.in b/www/mod_auth_kerb2/files/patch-Makefile.in index 3aa4cb620e0b..4f946f6e6a3a 100644 --- a/www/mod_auth_kerb2/files/patch-Makefile.in +++ b/www/mod_auth_kerb2/files/patch-Makefile.in @@ -1,14 +1,11 @@ ---- ./Makefile.in.orig 2008-12-02 15:07:10.000000000 +0100 -+++ ./Makefile.in 2014-03-09 17:54:19.000000000 +0100 -@@ -1,6 +1,7 @@ +--- Makefile.in.orig 2008-12-02 09:07:10.000000000 -0500 ++++ Makefile.in 2014-06-17 14:09:26.000000000 -0400 +@@ -1,4 +1,5 @@ APXS = @APXS@ -+APXS_STAGE= @APXS_STAGE@ ++APXS_STAGE = @APXS_STAGE@ KRB5_CPPFLAGS = @KRB5_CPPFLAGS@ --KRB5_LDFLAGS = @KRB5_LDFLAGS@ -+KRB5_LDFLAGS = @KRB5_LDFLAGS@ -lgssapi_krb5 + KRB5_LDFLAGS = @KRB5_LDFLAGS@ KRB4_CPPFLAGS = @KRB4_CPPFLAGS@ - KRB4_LDFLAGS = @KRB4_LDFLAGS@ - LIB_resolv = @LIB_resolv@ @@ -16,7 +17,7 @@ ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS}" "-c" "src/mod_auth_kerb.c" |