diff options
| author |   Sam James <sam@gentoo.org> | 2021-03-25 12:50:15 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-03-25 13:02:16 +0000 |
| commit | 232b26749202346408c3757cc4c79af08208007a (patch) | |
| tree | 1150424ea8dfe2a746626eab22fc2405305c4d74 /app-crypt/mit-krb5 | |
| parent | net-nds/openldap: fix build with slibtool (diff) | |
| download | gentoo-232b26749202346408c3757cc4c79af08208007a.tar.gz gentoo-232b26749202346408c3757cc4c79af08208007a.tar.bz2 gentoo-232b26749202346408c3757cc4c79af08208007a.zip | |
app-crypt/mit-krb5: fix build with autoconf 2.70
Thanks-to: Sergei Trofimovich <slyfox@gentoo.org>
Closes: https://bugs.gentoo.org/778167
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-crypt/mit-krb5')
| -rw-r--r-- | app-crypt/mit-krb5/files/mit-krb5-1.18.2-autoconf-2.70.patch | 35 | ||||
| -rw-r--r-- | app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.18.2-autoconf-2.70.patch b/app-crypt/mit-krb5/files/mit-krb5-1.18.2-autoconf-2.70.patch new file mode 100644 index 000000000000..6741c47e0d13 --- /dev/null +++ b/app-crypt/mit-krb5/files/mit-krb5-1.18.2-autoconf-2.70.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/778167 + +From f78edbe30816f049e1360cb6e203fabfdf7b98df Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Fri, 6 Nov 2020 08:14:57 +0000 +Subject: [PATCH] Fix compatibility with upcoming autoconf 2.70 + +Mainline autoconf generates no shell code for AC_CONFIG_AUX_DIR(). +Call it unconditionally to avoid a syntax error. + +[ghudson@mit.edu: rewrote commit message] + +ticket: 8960 (new) +tags: pullup +target_version: 1.18-next +target_version: 1.17-next +--- + src/aclocal.m4 | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +--- src/aclocal.m4 ++++ src/aclocal.m4 +@@ -13,11 +13,7 @@ fi + ac_topdir=$srcdir/$ac_reltopdir + ac_config_fragdir=$ac_reltopdir/config + # echo "Looking for $srcdir/$ac_config_fragdir" +-if test -d "$srcdir/$ac_config_fragdir"; then +- AC_CONFIG_AUX_DIR(K5_TOPDIR/config) +-else +- AC_MSG_ERROR([can not find config/ directory in $ac_reltopdir]) +-fi ++AC_CONFIG_AUX_DIR(K5_TOPDIR/config) + ])dnl + dnl + dnl Version info. diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild index 15bd4e8cb416..8482b1acd95e 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild @@ -65,6 +65,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.18-libressl.patch" "${FILESDIR}/CVE-2020-28196.patch" "${FILESDIR}/${PN}-1.18.2-krb5-config.patch" + "${FILESDIR}/${PN}-1.18.2-autoconf-2.70.patch" ) MULTILIB_CHOST_TOOLS=( |