[bug-diffutils] bug#63605: FYI: build improvement+fix

[Jim Meyering]

I've just pushed these:

  build: modernize bootstrap prerequsite tools
  Following Pádraig Brady's example from coreutils, ...
  * bootstrap.conf: Add an explicit requirement on m4.
  Add an explicit requirement on texi2pdf which is often packaged
  separately to makeinfo and induces a failure far down the
  distribution phase if not present.
  Replace the rsync dependency with wget,
  which gnulib changed to in 2018.
  Also, add an xz requirement and a version for autopoint.

  build: fix a new syntax-check failure
  * src/diff.h (robust_output_style): Put DIFF_INLINE and
  the function name on the same line, so that syntax-check's
  naive parsing can spot this function.
  * cfg.mk (_gl_TS_extern): Add DIFF_INLINE.

>From 55260678d9cb3269a853916a59f1b8842c4d87e4 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Sat, 20 May 2023 02:16:52 -0700
Subject: [PATCH 1/2] build: modernize bootstrap prerequsite tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Following Pádraig Brady's example from coreutils, ...
* bootstrap.conf: Add an explicit requirement on m4.
Add an explicit requirement on texi2pdf which is often packaged
separately to makeinfo and induces a failure far down the
distribution phase if not present.
Replace the rsync dependency with wget,
which gnulib changed to in 2018.
Also, add an xz requirement and a version for autopoint.
---
 bootstrap.conf | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 83e08ab..6630b15 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -124,18 +124,21 @@ gnulib_tool_option_extras="--tests-base=gnulib-tests

 # Build prerequisites
 buildreq="\
-autoconf   2.62
+autoconf   2.64
 automake   1.12.2
-autopoint  -
+autopoint  0.19.2
 gettext    0.19.2
 git        1.4.4
 gperf      -
 gzip       -
 help2man   -
+m4         -
 makeinfo   -
 perl       5.5
-rsync      -
+texi2pdf   6.1
 tar        -
+wget       -
+xz         -
 "

 bootstrap_post_import_hook ()
-- 
2.41.0.rc0.4.g004e0f790f


>From b079f08cc9b7236e7ada9edc3764ce14e3828b54 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Sat, 20 May 2023 02:43:07 -0700
Subject: [PATCH 2/2] build: fix a new syntax-check failure

* src/diff.h (robust_output_style): Put DIFF_INLINE and
the function name on the same line, so that syntax-check's
naive parsing can spot this function.
* cfg.mk (_gl_TS_extern): Add DIFF_INLINE.
---
 cfg.mk     | 2 +-
 src/diff.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index e21ff19..b58175e 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -74,4 +74,4 @@ exclude_file_name_regexp--sc_space_tab = ^gl/lib/.*\.c\.diff$$
 exclude_file_name_regexp--sc_prohibit_doubled_word = ^tests/y2038-vs-32bit$$

 # Tell gnulib's tight_scope rule that we mark externs with XTERN
-export _gl_TS_extern = extern|XTERN
+export _gl_TS_extern = extern|XTERN|DIFF_INLINE
diff --git a/src/diff.h b/src/diff.h
index 276e2d4..75d5ab0 100644
--- a/src/diff.h
+++ b/src/diff.h
@@ -96,8 +96,7 @@ enum output_style

 /* True for output styles that are robust,
    i.e. can handle a file that ends in a non-newline.  */
-DIFF_INLINE bool
-robust_output_style (enum output_style s)
+DIFF_INLINE bool robust_output_style (enum output_style s)
 {
   return s != OUTPUT_ED && s != OUTPUT_FORWARD_ED;
 }
-- 
2.41.0.rc0.4.g004e0f790f