heimdal: fix sqlite3 missing for pkgconf

also backport a build fix with autoconf 2.71
This commit is contained in:
Christoph Reiter 2021-11-17 21:46:09 +01:00
parent adf475b5ae
commit 04f9a6b83a
3 changed files with 45 additions and 3 deletions

View File

@ -29,3 +29,12 @@
deplibs="$deplibs @LIB_crypt@ @PTHREAD_LIBADD@ @LIB_dlopen@"
deplibs="$deplibs @LIB_door_create@ @LIBS@"
if test X"$do_lib_deps" = X"yes"; then
--- heimdal-heimdal-7.7.0/tools/heimdal-krb5.pc.in.orig 2021-11-17 20:34:49.114000200 +0100
+++ heimdal-heimdal-7.7.0/tools/heimdal-krb5.pc.in 2021-11-17 20:35:11.836935200 +0100
@@ -8,5 +8,5 @@
Description: Heimdal implementation of the Kerberos network authentication.
Version: @VERSION@
Libs: -L${libdir} -lkrb5
-Libs.private: @LIB_pkinit@ -lcom_err @LIB_hcrypto_appl@ -lasn1 -lwind -lheimbase -lroken @LIB_crypt@ @PTHREAD_LIBADD@ @LIB_dlopen@ @LIB_door_create@ @LIBS@
+Libs.private: @LIB_pkinit@ -lcom_err @LIB_hcrypto_appl@ -lasn1 -lwind -lheimbase -lroken @LIB_crypt@ @PTHREAD_LIBADD@ @LIB_dlopen@ @LIB_door_create@ @LIB_sqlite3@ @LIBS@
Cflags: -I${includedir}

View File

@ -0,0 +1,29 @@
From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Wed, 17 Mar 2021 17:49:18 +0100
Subject: [PATCH] autoconf-2.70 fix
autoconf-2.70 and newer are more strict with quoting etc. and thus generate
a broken configure file:
configure: 20855: Syntax error: ")" unexpected (expecting "fi")
Gentoo-bug: https://bugs.gentoo.org/776241
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
cf/check-var.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cf/check-var.m4 b/cf/check-var.m4
index 2fd7bca6f0..71d6f70ca8 100644
--- a/cf/check-var.m4
+++ b/cf/check-var.m4
@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo)
if test "$ac_foo" = yes; then
AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1,
[Define if you have the `]$1[' variable.])
- m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2]))
+ m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])])
fi
])

View File

@ -20,17 +20,19 @@ source=(https://github.com/heimdal/heimdal/archive/heimdal-${pkgver}.tar.gz
1.5.3-fix-detect-libedit.patch
7.5.0-hcrypto-build-fix.patch
7.5.0-names-clash-with-openssl.patch
7.7.0-find-python-706.patch)
7.7.0-find-python-706.patch
7.7.0-fix-autoconf-2.71.patch)
sha256sums=('f7d414d0914abb0e151a276b4de22cf4977fd6c28bd9ecdd990407b1138a945c'
'b18c9ca3f2db08cea0a4b7d7f07e8656360af848b3a30a5fa8d748240989da49'
'a99f0f5b69d32524399b1343a4f08b2de43351828b5b45a938f72bacb0eb9085'
'd68bb0f8f01cc748a6ef63c74a4a15c75553c2322e9bd2649c54cb23077d521b'
'bf19c5d7326a0cf58a5b4922a9c96fb78807226bc40c2248417024b961dd559e'
'eecd77ec817f88406f315c1b21559d888f1e0b3182aad317031f7ebc62f69b5b'
'5039112bbe27b814df115eca40607b957c13dd40bdc1d2d1ccc62b31fcfe87ac'
'bb96587539084c2ea9e06da8d2b4c768edd8dd422587a045ea60d1aa3eeb6a8a'
'f387721cc311a82ce2d4793187957d5323aa773538ea3268175741712534f8d4'
'bfe321c0391d6f7e23abecc22e9941bcb79d0b67abb9975246a9f462ec32513b'
'82120cf0fe00b6dc6f29cc2724dded4452eed860d977fd02568b0322093a0572')
'82120cf0fe00b6dc6f29cc2724dded4452eed860d977fd02568b0322093a0572'
'3366bc224b97321d3ed830cf18269753404f6b5618ca4c71239be435a374f6da')
prepare() {
cd ${srcdir}/heimdal-heimdal-${pkgver}
@ -45,6 +47,8 @@ prepare() {
patch -p1 -i "${srcdir}"/7.5.0-names-clash-with-openssl.patch
# https://github.com/heimdal/heimdal/pull/706
patch -p1 -i "${srcdir}"/7.7.0-find-python-706.patch
# https://github.com/heimdal/heimdal/pull/771
patch -p1 -i "${srcdir}"/7.7.0-fix-autoconf-2.71.patch
./autogen.sh
}