diff options
| author | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-04-03 23:49:23 -0700 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-04-03 23:50:55 -0700 |
| commit | 3bf2847bb8b933b7a79a38bab913535187d38f56 (patch) | |
| tree | 59f4cec0990f49cc1bdfe86ac061161e2378917a | |
| parent | 62069712927ba5ae0f9cfe62d6aa87a616bdc1ac (diff) | |
| download | meta-openembedded-3bf2847bb8b933b7a79a38bab913535187d38f56.tar.gz | |
krb5: Fix build with autotools 2.73
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
| -rw-r--r-- | meta-oe/recipes-connectivity/krb5/krb5/0001-configure.ac-replace-K5_AC_INIT-with-explicit-AC_INI.patch | 37 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/0001-configure.ac-replace-K5_AC_INIT-with-explicit-AC_INI.patch b/meta-oe/recipes-connectivity/krb5/krb5/0001-configure.ac-replace-K5_AC_INIT-with-explicit-AC_INI.patch new file mode 100644 index 0000000000..9fb9b38a63 --- /dev/null +++ b/meta-oe/recipes-connectivity/krb5/krb5/0001-configure.ac-replace-K5_AC_INIT-with-explicit-AC_INI.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | From 1b54d6a42677bd4209cf5c893802c7f60dc0ad75 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 3 | Date: Fri, 3 Apr 2026 23:43:18 -0700 | ||
| 4 | Subject: [PATCH] configure.ac: replace K5_AC_INIT with explicit AC_INIT | ||
| 5 | |||
| 6 | autoreconf expects configure.ac to contain a literal AC_INIT invocation. | ||
| 7 | krb5 currently uses the custom K5_AC_INIT wrapper, which expands to | ||
| 8 | AC_INIT but is not recognized by autoreconf's initial sanity check, | ||
| 9 | causing configuration to fail with: | ||
| 10 | |||
| 11 | autoreconf: error: configure.ac: AC_INIT not found | ||
| 12 | |||
| 13 | Replace K5_AC_INIT([aclocal.m4]) with its explicit expansion: | ||
| 14 | AC_INIT(...), AC_CONFIG_SRCDIR([aclocal.m4]), and build_dynobj=no. | ||
| 15 | |||
| 16 | This preserves the existing behavior while allowing autoreconf-based | ||
| 17 | builds to succeed. | ||
| 18 | |||
| 19 | Upstream-Status: Pending | ||
| 20 | |||
| 21 | Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> | ||
| 22 | --- | ||
| 23 | src/configure.ac | 4 +++- | ||
| 24 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
| 25 | |||
| 26 | diff --git a/src/configure.ac b/src/configure.ac | ||
| 27 | index 4325fae..03e224f 100644 | ||
| 28 | --- a/src/configure.ac | ||
| 29 | +++ b/src/configure.ac | ||
| 30 | @@ -1,4 +1,6 @@ | ||
| 31 | -K5_AC_INIT([aclocal.m4]) | ||
| 32 | +AC_INIT([Kerberos 5], m4_defn([K5_VERSION]), m4_defn([K5_BUGADDR]), [krb5]) | ||
| 33 | +AC_CONFIG_SRCDIR([aclocal.m4]) | ||
| 34 | +build_dynobj=no | ||
| 35 | |||
| 36 | # If $runstatedir isn't set by autoconf (<2.70), set it manually. | ||
| 37 | if test x"$runstatedir" = x; then | ||
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb index 5d8ab2dc01..89e5502847 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.22.2.bb | |||
| @@ -23,6 +23,7 @@ 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://fix-strchr-conformance-to-C23.patch;striplevel=2 \ | 24 | file://fix-strchr-conformance-to-C23.patch;striplevel=2 \ |
| 25 | file://crosscompile_nm.patch \ | 25 | file://crosscompile_nm.patch \ |
| 26 | file://0001-configure.ac-replace-K5_AC_INIT-with-explicit-AC_INI.patch;striplevel=2 \ | ||
| 26 | file://etc/init.d/krb5-kdc \ | 27 | file://etc/init.d/krb5-kdc \ |
| 27 | file://etc/init.d/krb5-admin-server \ | 28 | file://etc/init.d/krb5-admin-server \ |
| 28 | file://etc/default/krb5-kdc \ | 29 | file://etc/default/krb5-kdc \ |
