diff options
| author | Colin Watson <cjwatson@debian.org> | 2018-05-29 05:38:49 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2018-05-29 05:38:49 +0100 |
| commit | 3b1ed1a73997b627b571df66f4b32af5d4be50ed (patch) | |
| tree | 7e457170ac51381856dfd0b19d1d0ff7ab27d1c7 /bootstrap.conf | |
| parent | ccff906eeeeb1a3f0d694db8d890cfdf76f54a9a (diff) | |
Upgrade to Gnulib 20180527
* bootstrap.conf (GNULIB_URL): Remove.
(GNULIB_REVISION): Set to 90f289f249a266b1afb9c63e182f5d979d17df5f.
(gnulib_modules): Replace gettext with gettext-h.
(gnulib_tool_option_extras): Remove --no-cache-modules (accidental
leftover from earlier testing).
(local_gl_dir): Set to 'gnulib-local' to avoid confusion with 'gl' as
the local output directory. Remove 'rm -rf gl' hack, now superseded.
(buildreq): Bump minimum autopoint and gettext versions to 0.18.3,
matching previous change to configure.ac.
* configure.ac (AM_PROG_AR, LT_INIT): Move below gl_EARLY.
* patches/argp-domain.patch: Rebase.
* src/tests/Makefile.am (TESTS_ENVIRONMENT): Remove use of
@LOCALCHARSET_TESTS_ENVIRONMENT@, which is no longer needed by Gnulib.
Diffstat (limited to 'bootstrap.conf')
| -rw-r--r-- | bootstrap.conf | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 02c5d92f..b1980664 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -16,8 +16,7 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. -GNULIB_URL=git://erislabs.net/gnulib.git -GNULIB_REVISION=stable/20140202 +GNULIB_REVISION=90f289f249a266b1afb9c63e182f5d979d17df5f # gnulib modules used by this package. gnulib_modules=" @@ -33,7 +32,7 @@ gnulib_modules=" futimens getline getopt-gnu - gettext + gettext-h gitlog-to-changelog glob gnupload @@ -77,9 +76,12 @@ gnulib_tool_option_extras="\ --macro-prefix=gl \ --po-domain=man-db \ --no-vc-files \ - --no-cache-modules \ " +# This doesn't currently exist, but we set it to avoid confusion with 'gl' +# as the local output directory. +local_gl_dir=gnulib-local + gnulib_name=libgnu source_base=gl/lib m4_base=gl/m4 @@ -104,16 +106,12 @@ SKIP_PO=t buildreq="\ autoconf 2.59 automake 1.11 -autopoint 0.18.1 -gettext 0.18.1 +autopoint 0.18.3 +gettext 0.18.3 git 1.5.5 tar - " -# Remove any previous import before running gnulib-tool, as otherwise it -# seems to keep patched files around from previous runs. -rm -rf gl - bootstrap_post_import_hook () { patch -s -p1 <patches/argp-domain.patch patch -s -p1 <patches/fdutimens-hurd.patch |