1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

Conditionally add "-lgssapi_krb5" to KRB5_LDFLAGS. This fixes build with

security/heimdal.

PR:		ports/124375
Approved by:	apache (maintainer, timeout 6+ years)
This commit is contained in:
Jung-uk Kim 2014-06-17 18:44:04 +00:00
parent 0685b3e969
commit 112ef59b2c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=358159
2 changed files with 9 additions and 8 deletions

View File

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

View File

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