From: Simon McVittie <smcv@collabora.com>
Date: Tue, 22 Nov 2022 20:43:41 +0000 (+0000)
Subject: build: Divide mit-krb5-gssapi link flags between LDFLAGS and LIBS
X-Git-Tag: archive/raspbian/8.4.0-2+rpi1^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ef22645ba3c105f4d982a1dc4149a10adf1bcc3d;p=curl.git

build: Divide mit-krb5-gssapi link flags between LDFLAGS and LIBS

From the comments nearby about not having --libs-only-L, it looks as
though the intention was to apply a split like this to all dependency
libraries where possible, and the only reason it was not done for
Kerberos is that krb5-config doesn't have that feature and pkg-config
was originally not supported here. For example, zlib, libssh and librtmp
all have their flags from pkg-config split in this way.

Now that pkg-config is supported here, we can do the intended split.

Signed-off-by: Simon McVittie <smcv@collabora.com>

Gbp-Pq: Name build-Divide-mit-krb5-gssapi-link-flags-between-LDFLAGS-a.patch
---

diff --git a/configure.ac b/configure.ac
index 2d71c838..a42c8ef4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1917,7 +1917,8 @@ if test x"$want_gss" = xyes; then
            gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
            LIBS="$gss_libs $LIBS"
         elif test "$PKGCONFIG" != "no" ; then
-           gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi`
+           LDFLAGS="$LDFLAGS `$PKGCONFIG --libs-only-L mit-krb5-gssapi`"
+           gss_libs=`$PKGCONFIG --libs-only-l mit-krb5-gssapi`
            LIBS="$gss_libs $LIBS"
         elif test -f "$KRB5CONFIG"; then
            dnl krb5-config doesn't have --libs-only-L or similar, put everything