diff mbox series

[2/4] diffstat: change configure.in to use standard autoconf

Message ID 20260330132825.1784802-2-ross.burton@arm.com
State New
Headers show
Series [1/4] gnutls: update patch status | expand

Commit Message

Ross Burton March 30, 2026, 1:28 p.m. UTC
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

Comments

patchtest@automation.yoctoproject.org March 30, 2026, 1:45 p.m. UTC | #1
Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch /home/patchtest/share/mboxes/2-4-diffstat-change-configure.in-to-use-standard-autoconf.patch

FAIL: test Upstream-Status presence: Upstream-Status is Inappropriate, but no reason was provided (test_patch.TestPatch.test_upstream_status_presence_format)

PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence (test_patch.TestPatch.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!
diff mbox series

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 \
            "