[25746] in CVS-changelog-for-Kerberos-V5
svn rev #25236: trunk/src/
daemon@ATHENA.MIT.EDU (ghudson@mit.edu)
Mon Sep 26 11:32:53 2011
Date: Mon, 26 Sep 2011 11:32:41 -0400
From: ghudson@mit.edu
Message-Id: <201109261532.p8QFWfqY009888@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
http://src.mit.edu/fisheye/changelog/krb5/?cs=25236
Commit By: ghudson
Log Message:
ticket: 6965
subject: Remove CFLAGS and external deps from krb5-config --libs
r15217 apparently intended to prune $(CFLAGS) from the --libs output,
but actually substituted in the value from the invoker's environment.
Actually prune it.
Don't output external dependencies like -lresolv or -ldl in
krb5-config --libs. We already don't generate output suitable for
static linking because we omit -lkrb5support, and there is no
expectation that bringing in the krb5 API also brings in the resolv or
dl APIs for the application.
We still output internal dependencies and a com_err dependency; for
instance, e.g. krb5-config --libs gssapi outputs a dependency on -lkrb5
and -lk5crypto, which is inappropriate for a program using only GSSAPI
interfaces. Removing internal dependencies would likely break callers
who have come to depend on them, especially as we've never correctly
supported things like "krb5-config --libs gssapi krb5" for a program
using multiple APIs.
>From stephane@archlinux.org with changes.
Changed Files:
U trunk/src/krb5-config.in
Modified: trunk/src/krb5-config.in
===================================================================
--- trunk/src/krb5-config.in 2011-09-26 15:04:39 UTC (rev 25235)
+++ trunk/src/krb5-config.in 2011-09-26 15:32:41 UTC (rev 25236)
@@ -186,7 +186,7 @@
-e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
-e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
-e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
+ -e 's#\$(CFLAGS)##'`
if test $library = 'kdb'; then
lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
@@ -214,9 +214,13 @@
fi
if test $library = 'krb5'; then
- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
+ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
fi
+ # If we ever support a flag to generate output suitable for static
+ # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB"
+ # here.
+
echo $lib_flags
fi
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
