From cd947d09f0374747837ad4fc7dafcb8650fa5ca2 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 14 Jan 2023 16:23:23 +0000 Subject: Upgrade to Gnulib stable-202301 * bootstrap: Sync to Gnulib 32a72f45374c9a36afa574d1a08bb98090270012. * bootstrap.conf (GNULIB_REVISION): Set to 32a72f45374c9a36afa574d1a08bb98090270012. * NEWS.md: Document this. --- bootstrap.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.conf') diff --git a/bootstrap.conf b/bootstrap.conf index 63883feb..a7c62db6 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -16,7 +16,7 @@ # along with this program. If not, see . -GNULIB_REVISION=df336dc1ae60d8ad9f452f2234951133fe617bb0 +GNULIB_REVISION=32a72f45374c9a36afa574d1a08bb98090270012 # gnulib modules used by this package. gnulib_modules=" -- cgit v1.2.3 From 1f69aec73795779e8d5ef0e9c4dfecb62489043d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 14 Jan 2023 17:20:35 +0000 Subject: Fix bootstrap_epilogue to handle running without --copy * bootstrap.conf (bootstrap_epilogue): Avoid leaving `docs/INSTALL.autoconf` as a dangling symbolic link if the `--copy` option is not used. --- bootstrap.conf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bootstrap.conf') diff --git a/bootstrap.conf b/bootstrap.conf index a7c62db6..48b04783 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -153,5 +153,11 @@ bootstrap_post_import_hook () { } bootstrap_epilogue () { - mv INSTALL docs/INSTALL.autoconf + # If --copy is not used, then INSTALL may be a symbolic link, in which + # case a simple "mv" could leave it pointing to the wrong target. Arrange + # (reasonably portably) for the target to end up as a regular file no + # matter what. + rm -f docs/INSTALL.autoconf + cp -Lp INSTALL docs/INSTALL.autoconf + rm -f INSTALL } -- cgit v1.2.3 From a7786662a26e9fd5d23a48cd1888d05a671eeeec Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 2 Mar 2023 09:49:32 +0000 Subject: Upgrade to Gnulib stable-202301 as of 20230209 * bootstrap.conf (GNULIB_REVISION): Set to c5dc86ca5c2e5c16177508bc32afe755b7995685. --- bootstrap.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.conf') diff --git a/bootstrap.conf b/bootstrap.conf index 48b04783..fee990f4 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -16,7 +16,7 @@ # along with this program. If not, see . -GNULIB_REVISION=32a72f45374c9a36afa574d1a08bb98090270012 +GNULIB_REVISION=c5dc86ca5c2e5c16177508bc32afe755b7995685 # gnulib modules used by this package. gnulib_modules=" -- cgit v1.2.3 From 54ec810261023af7686c62e34c142307b6ac0a6b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 22 Jul 2023 13:00:07 +0100 Subject: Upgrade to Gnulib stable-202307 * bootstrap: Sync to Gnulib b7f7ed06961454cdf77b93c6c00c3e3f26202663. * bootstrap.conf (GNULIB_REVISION): Set to b7f7ed06961454cdf77b93c6c00c3e3f26202663. * src/tests/Makefile.am (fspause_LDADD): Link with `$(NANOSLEEP_LIB)` instead of `$(LIB_NANOSLEEP)`. * NEWS.md: Document this. --- bootstrap.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.conf') diff --git a/bootstrap.conf b/bootstrap.conf index fee990f4..9496da61 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -16,7 +16,7 @@ # along with this program. If not, see . -GNULIB_REVISION=c5dc86ca5c2e5c16177508bc32afe755b7995685 +GNULIB_REVISION=b7f7ed06961454cdf77b93c6c00c3e3f26202663 # gnulib modules used by this package. gnulib_modules=" -- cgit v1.2.3 From 1e5c062a8ba27e16a1cbc615f64629a528ade11b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 22 Jul 2023 13:29:44 +0100 Subject: Ensure that time_t can go past 2038 * bootstrap.conf (gnulib_modules): Add `year2038-recommended`. * NEWS.md: Document this. --- bootstrap.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'bootstrap.conf') diff --git a/bootstrap.conf b/bootstrap.conf index 9496da61..3ae1dcca 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -90,6 +90,7 @@ gnulib_modules=" xstdopen xstrndup xvasprintf + year2038-recommended " gnulib_tool_option_extras="\ -- cgit v1.2.3 From 44d7623299899a590db39196132f9ea2568b5045 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 7 Aug 2023 23:04:21 +0100 Subject: Update to Gnulib stable-202307 as of 20230728 * bootstrap.conf (GNULIB_REVISION): Set to d1b40e09c9c04d5c1ff120373397c6180bc16beb. --- bootstrap.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.conf') diff --git a/bootstrap.conf b/bootstrap.conf index 3ae1dcca..500b9ade 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -16,7 +16,7 @@ # along with this program. If not, see . -GNULIB_REVISION=b7f7ed06961454cdf77b93c6c00c3e3f26202663 +GNULIB_REVISION=d1b40e09c9c04d5c1ff120373397c6180bc16beb # gnulib modules used by this package. gnulib_modules=" -- cgit v1.2.3 From b403f6d413e2b01993de56906bd28480882badb6 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 20 Aug 2023 21:23:12 +0100 Subject: bootstrap: Make --skip-po disable Gnulib downloads too Fixes https://bugs.debian.org/1050089. * bootstrap.conf: If the `--skip-po` option is explicitly passed, then don't pass `--po-base` or `--po-domain` options to `gnulib-tool`, and don't merge `gl/ref-po/` into `gl/po/`. --- bootstrap.conf | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) (limited to 'bootstrap.conf') diff --git a/bootstrap.conf b/bootstrap.conf index 500b9ade..caee513b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -94,14 +94,31 @@ gnulib_modules=" " gnulib_tool_option_extras="\ - --po-base=gl/ref-po \ --no-conditional-dependencies \ --libtool \ --macro-prefix=gl \ - --po-domain=man-db \ --no-vc-files \ " +# bootstrap's --skip-po option really just controls its own downloads, but +# it's somewhat useful to provide a way to skip the downloads performed by +# gnulib-tool as well. Since we always suppress bootstrap's downloads due +# to maintaining man-db's own translations manually, we need to parse the +# command line ourselves to find out whether --skip-po was explicitly +# passed. +explicit_skip_po= +for option; do + case $option in + --skip-po) + explicit_skip_po=t + ;; + esac +done + +if [ -z "$explicit_skip_po" ]; then + gnulib_tool_option_extras="$gnulib_tool_option_extras --po-base=gl/ref-po --po-domain=man-db" +fi + # This doesn't currently exist, but we set it to avoid confusion with 'gl' # as the local output directory. local_gl_dir=gnulib-local @@ -140,17 +157,19 @@ tar - bootstrap_post_import_hook () { patch -s -p1 gl/po/Makevars - if ls gl/ref-po/*.po >/dev/null 2>&1; then - cp -a gl/ref-po/*.po gl/po/ + if [ -z "$explicit_skip_po" ]; then + # gnulib-tool installs its own versions of gettext infrastructure files + # such as po/Makefile.in.in, which don't necessarily match our + # configured AM_GNU_GETTEXT_VERSION. To cope with this, we tell + # gnulib-tool to install into a temporary directory (using --po-base + # above) and fix things up here. + cp -a gl/ref-po/LINGUAS gl/ref-po/POTFILES.in gl/po/ + sed 's,^subdir *=.*,subdir = gl/po,' gl/ref-po/Makevars >gl/po/Makevars + if ls gl/ref-po/*.po >/dev/null 2>&1; then + cp -a gl/ref-po/*.po gl/po/ + fi + rm -rf gl/ref-po fi - rm -rf gl/ref-po } bootstrap_epilogue () { -- cgit v1.2.3