diff options
| author | Khem Raj <raj.khem@gmail.com> | 2023-03-30 10:01:02 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-03-31 10:42:43 -0700 |
| commit | 1807ecfe4b4d40df0873210f36276188431383ab (patch) | |
| tree | 1fdd64902c49e9a3b8f996dfdb6482322c70992c /meta-oe | |
| parent | 2f06781b8721d4b9431bdf6924ca93f43cc53882 (diff) | |
| download | meta-openembedded-1807ecfe4b4d40df0873210f36276188431383ab.tar.gz | |
krb5: Fix build with autoconf 2.72
Fixes
checking for IPv6 compile-time support without -DINET6... ./configure: line 10004: syntax error near unexpected token `;;'
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch | 40 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch new file mode 100644 index 0000000000..9d0b066b10 --- /dev/null +++ b/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | From 0aa127afa52fd265a4f1bbded1623201390ae96a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Julien Rische <jrische@redhat.com> | ||
| 3 | Date: Thu, 17 Nov 2022 15:01:24 +0100 | ||
| 4 | Subject: [PATCH] Fix aclocal.m4 syntax error for autoconf 2.72 | ||
| 5 | |||
| 6 | An incorrect closure inside KRB5_AC_INET6 is innocuous with autoconf | ||
| 7 | versions up to 2.71, but will cause an error at configure time with | ||
| 8 | the forthcoming autoconf 2.72. | ||
| 9 | |||
| 10 | [ghudson@mit.edu: added more context to commit message] | ||
| 11 | |||
| 12 | ticket: 9077 (new) | ||
| 13 | tags: pullup | ||
| 14 | target_version: 1.20-next | ||
| 15 | target_version: 1.19-next | ||
| 16 | |||
| 17 | Upstream-Status: Backport [https://github.com/krb5/krb5/commit/d864d740d019fdf2c640460f2aa2760c7fa4d5e9] | ||
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 19 | --- | ||
| 20 | src/aclocal.m4 | 4 ++-- | ||
| 21 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 22 | |||
| 23 | diff --git a/src/aclocal.m4 b/src/aclocal.m4 | ||
| 24 | index 9920476..3d66a87 100644 | ||
| 25 | --- a/src/aclocal.m4 | ||
| 26 | +++ b/src/aclocal.m4 | ||
| 27 | @@ -409,8 +409,8 @@ else | ||
| 28 | [[struct sockaddr_in6 in; | ||
| 29 | AF_INET6; | ||
| 30 | IN6_IS_ADDR_LINKLOCAL(&in.sin6_addr);]])], | ||
| 31 | - [krb5_cv_inet6=yes], [krb5_cv_inet6=no])]) | ||
| 32 | -fi | ||
| 33 | + [krb5_cv_inet6=yes], [krb5_cv_inet6=no]) | ||
| 34 | +fi]) | ||
| 35 | AC_MSG_RESULT($krb5_cv_inet6) | ||
| 36 | if test "$krb5_cv_inet6" = no && test "$ac_cv_func_inet_ntop" = yes; then | ||
| 37 | AC_MSG_CHECKING(for IPv6 compile-time support with -DINET6) | ||
| 38 | -- | ||
| 39 | 2.40.0 | ||
| 40 | |||
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb index 6fc630d99a..10fff11c25 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb | |||
| @@ -22,6 +22,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" | |||
| 22 | SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ | 22 | SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ |
| 23 | file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \ | 23 | file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \ |
| 24 | file://crosscompile_nm.patch \ | 24 | file://crosscompile_nm.patch \ |
| 25 | file://0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch;striplevel=2 \ | ||
| 25 | file://etc/init.d/krb5-kdc \ | 26 | file://etc/init.d/krb5-kdc \ |
| 26 | file://etc/init.d/krb5-admin-server \ | 27 | file://etc/init.d/krb5-admin-server \ |
| 27 | file://etc/default/krb5-kdc \ | 28 | file://etc/default/krb5-kdc \ |
