From 89a8269c109b56364bc5c7a63afb8e2888ba9143 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Wed, 29 Mar 2023 17:00:18 -0400 Subject: [PATCH] tools/automake: move file requirements to higher strictness GNU standards requires certain files at the top-level directory of a package that automake is used with, mostly documentation. If one of these files happens to be missing, autoreconf would fail. Move these file requirements to the more strict 'GNITS' setting. Link: https://www.gnu.org/software/automake/manual/html_node/Strictness.html Signed-off-by: Michael Pratt --- .../patches/101-do-not-require-files.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 tools/automake/patches/101-do-not-require-files.patch diff --git a/tools/automake/patches/101-do-not-require-files.patch b/tools/automake/patches/101-do-not-require-files.patch new file mode 100644 index 00000000000..3a8c9fcb47b --- /dev/null +++ b/tools/automake/patches/101-do-not-require-files.patch @@ -0,0 +1,29 @@ +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -4513,7 +4513,7 @@ sub handle_gettext () + && grep ($_ eq 'intl', @subdirs)); + } + +- require_file ($ac_gettext_location, GNU, 'ABOUT-NLS'); ++ require_file ($ac_gettext_location, GNITS, 'ABOUT-NLS'); + } + + # Emit makefile footer. +@@ -5641,7 +5641,7 @@ sub check_gnu_standards () + # otherwise require non-.md. + my $required + = (! -f $file && -f "$file.md") ? "$file.md" : $file; +- require_file ("$am_file.am", GNU, $required); ++ require_file ("$am_file.am", GNITS, $required); + } + + # Accept one of these three licenses; default to COPYING. +@@ -5655,7 +5655,7 @@ sub check_gnu_standards () + last; + } + } +- require_file ("$am_file.am", GNU, 'COPYING') ++ require_file ("$am_file.am", GNITS, 'COPYING') + unless $license; + } + -- 2.30.2