From dc292e8bb0f4d8b3b35430d7aaf4bc6cacea0ec6 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 8 Apr 2025 13:29:20 -0700 Subject: [PATCH 1/2] build: avoid new bootstrap failure * bootstrap.conf (bootstrap_post_import_hook): Append "|| :", fixing my previous change. Otherwise, bootstrap would fail with this: ./bootstrap: bootstrap_post_import_hook failed --- bootstrap.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.conf b/bootstrap.conf index f1cf72f..26db817 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -172,7 +172,7 @@ bootstrap_post_import_hook () test $found = 0 \ && die 'Cannot find pkg.m4; perhaps you need to install pkg-config' local url=https://lists.gnu.org/r/grep-devel/2025-04/msg00005.html - grep '^# serial 12' m4/pkg.m4 && die "do not use pkg.m4 serial 12; see $url" + grep '^# serial 12' m4/pkg.m4 && die "do not use pkg.m4 serial 12; see $url" || : } bootstrap_epilogue() -- 2.49.0.154.g9d22ac5122 From 082f068a5ed504f5e12c5e188a581c2f9915c194 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 8 Apr 2025 13:25:07 -0700 Subject: [PATCH 2/2] build: fix module name typo * bootstrap.conf (gnulib_modules): Fix module name typo I introduced. s/realloc-gnu-h/realloc-posix/. Reported by Bruno Haible in https://bugs.gnu.org/77654 --- bootstrap.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 26db817..780b035 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -80,7 +80,7 @@ openat-safer perl rawmemchr readme-release -realloc-gnu-h +realloc-posix regex safe-read same-inode @@ -172,7 +172,8 @@ bootstrap_post_import_hook () test $found = 0 \ && die 'Cannot find pkg.m4; perhaps you need to install pkg-config' local url=https://lists.gnu.org/r/grep-devel/2025-04/msg00005.html - grep '^# serial 12' m4/pkg.m4 && die "do not use pkg.m4 serial 12; see $url" || : + grep '^# serial 12' m4/pkg.m4 \ + && die "do not use pkg.m4 serial 12; see $url" || : } bootstrap_epilogue() -- 2.49.0.154.g9d22ac5122