On 07/09/2014 08:55 PM, Paul Eggert wrote: > Pádraig Brady wrote: >> Other have often expressed disdain for non readily available >> distro requiremnts like this. Should we consider reverting >> this until gettext-0.19 packages are easily available? > > The tradition in coreutils has been to use the latest stable version of the > tools, and to not worry overly much about older versions. This is easier for > me, at any rate. I know Jim sometimes prefers to use something that is even > later than the latest stable version, but I'm a bit more conservative. > > So, I'd rather just assume gettext 0.19.1 or later for developers. (Not > 0.19, as 0.19 doesn't work for 'grep' and anyway 0.19 is too old. :-)
Right. Anyway there were issues with 0.18.3.1 which this would avoid also. I was able to update to gettext 0.19 trivially on Fedora 15 even by rebuilding the rawhide rpm, and otherwise one can follow: http://git.sv.gnu.org/gitweb/?p=coreutils.git;a=blob_plain;f=README-prereq;hb=HEAD to install from source. So I'm proposing the attached update for coreutils so. thanks, Pádraig.
>From a5c8469d5d4dc6dfeb7bd5df4d03a2f6b207ed33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <p...@draigbrady.com> Date: Wed, 9 Jul 2014 13:41:40 +0100 Subject: [PATCH] build: sync with gnulib gettext 0.19 requirement When syncing with gnulib next, it will include updated gettext macros, and since coreutils indirectly depends on the gettext module due to: http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=41dca647 bootstrap will then update m4/po.m4 and thus require gettext >= 0.19 There were already issues with gettext 0.18.3 as detailed in commit v8.22-88-g2ccc60a, so updating to gettext >= 0.19.1 will avoid those issues also. * bootstrap: Remove moot warning (resyncing with gnulib). * bootstrap.conf: Update version to give early warning. * configure.ac: Set 0.19.1 as required version. * scripts/autotools-install: Update to latest tarball. --- bootstrap | 15 --------------- bootstrap.conf | 2 +- configure.ac | 2 +- scripts/autotools-install | 2 +- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/bootstrap b/bootstrap index a3e68f0..ce90bc4 100755 --- a/bootstrap +++ b/bootstrap @@ -807,21 +807,6 @@ version_controlled_file() { fi } -# Avoid boostrap failure with gettext/autopoint bug in version 0.18.3.1 -# http://lists.gnu.org/archive/html/coreutils/2013-11/msg00038.html -# Remove in 2015 when distros have upgraded to >= 0.18.3.2 -autopoint_version=$(get_version $AUTOPOINT) -# Note autopoint returns version 0.18.3 for version 0.18.3.1 -if test "$autopoint_version" = '0.18.3' ; then - if test "$package" = 'coreutils' ; then - test -e 'm4/cu-progs.m4' || touch 'm4/cu-progs.m4' - fi - if ! test -e 'build-aux/git-version-gen' ; then - printf "#!/bin/sh\n" > 'build-aux/git-version-gen' - chmod a+x 'build-aux/git-version-gen' - fi -fi - # NOTE: we have to be careful to run both autopoint and libtoolize # before gnulib-tool, since gnulib-tool is likely to provide newer # versions of files "installed" by these two programs. diff --git a/bootstrap.conf b/bootstrap.conf index 98e83bb..50a6765 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -319,7 +319,7 @@ autoconf 2.64 automake 1.11.2 autopoint - bison - -gettext 0.18.1 +gettext 0.19.1 git 1.4.4 gperf - gzip - diff --git a/configure.ac b/configure.ac index 01098cf..0a7c2f1 100644 --- a/configure.ac +++ b/configure.ac @@ -506,7 +506,7 @@ AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in # translatable strings, we must use need-formatstring-macros here. AM_GNU_GETTEXT([external], [need-formatstring-macros]) -AM_GNU_GETTEXT_VERSION([0.18.1]) +AM_GNU_GETTEXT_VERSION([0.19.1]) # For a test of uniq: it uses the $LOCALE_FR envvar. gt_LOCALE_FR diff --git a/scripts/autotools-install b/scripts/autotools-install index b8e79b9..1a138c2 100755 --- a/scripts/autotools-install +++ b/scripts/autotools-install @@ -26,7 +26,7 @@ tarballs=' http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz http://ftp.gnu.org/gnu/automake/automake-1.14.1.tar.gz http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz - http://ftp.gnu.org/gnu/gettext/gettext-0.18.3.2.tar.gz + http://ftp.gnu.org/gnu/gettext/gettext-0.19.1.tar.gz ' usage() { -- 1.7.7.6
