File: build-Divide-mit-krb5-gssapi-link-flags-between-LDFLAGS-a.patch

package info (click to toggle)
curl 8.16.0~rc3-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 31,864 kB
  • sloc: ansic: 202,506; perl: 20,326; python: 9,407; sh: 6,655; makefile: 1,518; pascal: 234; cpp: 173
file content (32 lines) | stat: -rw-r--r-- 1,357 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
From: Simon McVittie <smcv@collabora.com>
Date: Tue, 22 Nov 2022 20:43:41 +0000
Subject: 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>
---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f263e4d..a411802 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1923,7 +1923,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"
         link_pkgconfig=1
       elif test -f "$KRB5CONFIG"; then