commit:     e00c050d8db2767817094d1701a6744337ac9076
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 06:29:15 2021 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 06:29:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00c050d

app-crypt/heimdal: fix building with autoconf-2.70

Closes: https://bugs.gentoo.org/776241
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 .../heimdal/files/heimdal_fix-autoconf-2.70.patch  | 29 ++++++++++++++++++++++
 app-crypt/heimdal/heimdal-7.7.0-r1.ebuild          |  1 +
 2 files changed, 30 insertions(+)

diff --git a/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch 
b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch
new file mode 100644
index 00000000000..0dcc3102620
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch
@@ -0,0 +1,29 @@
+From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <[email protected]>
+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 <[email protected]>
+---
+ 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
+ ])
+ 

diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild 
b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index e6fabf4e954..1140bf30c50 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
        "${FILESDIR}/heimdal_hcrypto.patch"
        "${FILESDIR}/heimdal_build-headers-before-use.patch"
        "${FILESDIR}/heimdal_fix-db60.patch"
+       "${FILESDIR}/heimdal_fix-autoconf-2.70.patch"
 )
 
 src_prepare() {

Reply via email to