public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Ross Burton <ross.burton@arm.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/4] diffstat: change configure.in to use standard autoconf
Date: Mon, 30 Mar 2026 14:28:23 +0100	[thread overview]
Message-ID: <20260330132825.1784802-2-ross.burton@arm.com> (raw)
In-Reply-To: <20260330132825.1784802-1-ross.burton@arm.com>

diffstat uses a fork of autoconf which we don't package, but we need to
autoreconf the configure.in because it has buggy macros. The new version
of autoconf however notices that AC_OUTPUT is being called with invalid
arguments and refuses to run.

Luckily it's easy to use standard autoconf: delete the hand-coded
config_h.in so that autoheader runs, and use the standard form of
AC_OUTPUT to generate the Makefile and config.h.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../diffstat/diffstat/standard-autoconf.patch | 48 +++++++++++++++++++
 .../diffstat/diffstat_1.68.bb                 |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 meta/recipes-devtools/diffstat/diffstat/standard-autoconf.patch

diff --git a/meta/recipes-devtools/diffstat/diffstat/standard-autoconf.patch b/meta/recipes-devtools/diffstat/diffstat/standard-autoconf.patch
new file mode 100644
index 00000000000..b301c2d86db
--- /dev/null
+++ b/meta/recipes-devtools/diffstat/diffstat/standard-autoconf.patch
@@ -0,0 +1,48 @@
+From 0069056a23b39f53a05b89b2545a3a5ad1ff070a Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Wed, 18 Mar 2026 11:27:24 +0000
+Subject: [PATCH] Use standard autoconf
+
+diffstat uses a fork of autoconf which we don't package but we need to autoreconf
+the configure.in because it has buggy macros.
+
+Delete the hand-coded config_h.in so that autoheader runs, and use the standard
+form of AC_OUTPUT.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ config_h.in  | 8 --------
+ configure.in | 2 +-
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+ delete mode 100644 config_h.in
+
+diff --git a/config_h.in b/config_h.in
+deleted file mode 100644
+index ac8ff1d..0000000
+--- a/config_h.in
++++ /dev/null
+@@ -1,8 +0,0 @@
+-/* 
+- * $Id: config_h.in,v 1.1 1994/06/12 23:48:18 tom Exp $
+- * config_h.in is a template file used by configure to produce config.h.
+- * config_h is then transformed (by config.status) into the header file 
+- * config.h -- Kevin Buettner.
+- */
+-
+-@DEFS@
+diff --git a/configure.in b/configure.in
+index cb641d4..7042800 100644
+--- a/configure.in
++++ b/configure.in
+@@ -83,5 +83,6 @@ CF_WITH_MAN2HTML
+ CF_DISABLE_LEAKS
+ 
+ ###	output makefile and config.h
+-AC_OUTPUT(makefile,,,cat)
++AC_CONFIG_FILES([makefile])
++AC_OUTPUT
+ CF_MAKE_DOCS(diffstat,1)
+-- 
+2.43.0
+
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.68.bb b/meta/recipes-devtools/diffstat/diffstat_1.68.bb
index 488f0834d64..4bc18158378 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.68.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.68.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0c432d3aeb935855b2ca1ad2a0542ce4"
 
 SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
            file://run-ptest \
+           file://standard-autoconf.patch \
            file://avoid-check-user-break-cc.patch \
            "
 
-- 
2.43.0



  reply	other threads:[~2026-03-30 13:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-30 13:28 [PATCH 1/4] gnutls: update patch status Ross Burton
2026-03-30 13:28 ` Ross Burton [this message]
2026-03-30 13:45   ` Patchtest results for [PATCH 2/4] diffstat: change configure.in to use standard autoconf patchtest
2026-03-30 13:28 ` [PATCH 3/4] autoconf: upgrade to 2.73 Ross Burton
2026-03-30 13:31   ` [OE-core] " Ross Burton
2026-04-01 20:33     ` Khem Raj
2026-04-07 19:43       ` Ross Burton
2026-04-07 20:46         ` Khem Raj
2026-03-30 13:28 ` [PATCH 4/4] recipes: remove redundant autoreconf excludes Ross Burton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260330132825.1784802-2-ross.burton@arm.com \
    --to=ross.burton@arm.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox