curl: remove heimdal hack again

the .pc file is fixed now
This commit is contained in:
Christoph Reiter
2021-11-17 23:43:42 +01:00
parent 04f9a6b83a
commit fd99a01a97
2 changed files with 5 additions and 8 deletions

View File

@@ -3,7 +3,7 @@
pkgbase=curl
pkgname=('curl' 'libcurl' 'libcurl-devel')
pkgver=7.80.0
pkgrel=2
pkgrel=3
pkgdesc="Multi-protocol file transfer utility"
arch=('i686' 'x86_64')
url="https://curl.haxx.se"
@@ -21,7 +21,7 @@ sha256sums=('a132bd93188b938771135ac7c1f3ac1d3ce507c1fcbef8c471397639214ae2ab'
'SKIP'
'e5ba067afcfd726403cf7e6cb2349ff3fe6fe093c2853a4196a8f57f9f56d8d6'
'ad3d76013c2dd683c44ad4cdc5108ea5218056c87b66f6ed2a90502e785a39af'
'39a5caed671a9c2b2011328ac344bf38362fa6cb1723650cd79c96542df380cb'
'ce2b55e269c43bfaf7582292674b3cbba9a5de454866ced45f779be843482bae'
'870a91d09480cd0d1dc74119376350fc430e5223e2d4b3c0606af17793ecc310')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2' # Daniel Stenberg
'914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg (old key)

View File

@@ -15,7 +15,7 @@
elif test "$GSSAPI_ROOT" != "yes"; then
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
fi
@@ -1772,15 +1772,16 @@
@@ -1772,14 +1772,14 @@
LIBS="-lgssapi_krb5 -lresolv $LIBS"
;;
*)
@@ -29,10 +29,7 @@
LIBS="$gss_libs $LIBS"
elif test "$PKGCONFIG" != "no" ; then
- gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi`
- LIBS="$gss_libs $LIBS"
+ gss_libs=`$PKGCONFIG --static --libs krb5-gssapi`
+ # XXX: sqlite3 is missing due to https://github.com/msys2/MSYS2-packages/issues/2701
+ LIBS="$gss_libs -lsqlite3 $LIBS"
LIBS="$gss_libs $LIBS"
else
case $host in
*-hp-hpux*)
case $host in