On 27/04/15 10:55, Bernhard Voelker wrote: > On 04/27/2015 09:27 AM, Paul Eggert wrote: >> Bernhard Voelker wrote: >>> Could we work around >>> it? >> >> Sure, how about if we shrink it down to 0.19? Would that work for you? > > yes, "0.19" is okay for me - openSUSE-13.2 has 0.19.2.
I set to 0.19.2 after checking a few distros. I pushed that and the other 4 attached patches due the updated gnulib. thanks, Pádraig.
>From 824bcc6434ca7914905fb0cdb54f8bf47009ffb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]> Date: Mon, 27 Apr 2015 11:07:33 +0100 Subject: [PATCH 5/5] maint: use gnulib styling with the online manual The equivalent styling added in v8.23-155-g3b98ee7, is now applied to gnulib using projects by default. --- README-release | 1 - 1 file changed, 1 deletion(-) diff --git a/README-release b/README-release index d71a3f1..20fcb9e 100644 --- a/README-release +++ b/README-release @@ -121,5 +121,4 @@ Once all the builds and tests have passed, by running this: - export gendocs_options_='--html "--css-ref=/software/coreutils/manual.css"' build-aux/gnu-web-doc-update -- 2.3.4
>From b817f62769a3997bce5140f46bd117c48d208d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]> Date: Mon, 27 Apr 2015 11:00:07 +0100 Subject: [PATCH 4/5] build: rely on gnulib to determine printf routines are safe gnulib now only checks that the printf routines never crash, which is all coreutils currrently requires, and so we revert commit v8.23-81-gf57bfbb to let gnulib decide whether to replace the system printf routines. --- configure.ac | 6 ------ 1 file changed, 6 deletions(-) diff --git a/configure.ac b/configure.ac index cac9ab2..e608611 100644 --- a/configure.ac +++ b/configure.ac @@ -67,12 +67,6 @@ cu_have_perl=yes case $PERL in *"/missing "*) cu_have_perl=no;; esac AM_CONDITIONAL([HAVE_PERL], [test $cu_have_perl = yes]) -# Disable the checks for handling certain invalid long double values -# since this results in always replacing the printf() implementation -# (see https://sourceware.org/bugzilla/show_bug.cgi?id=17661) and -# od (ftoastr) doesn't use the replacement anyway. -m4_divert_text([INIT_PREPARE], [gl_printf_safe='']) - # gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found]) # ------------------------------------------------ # If $CPP is gcc-MAJOR.MINOR or newer, then run RUN-IF-FOUND. -- 2.3.4
>From 0e7ac9a4609248663af76f202418dabf1c13efbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]> Date: Mon, 27 Apr 2015 10:44:25 +0100 Subject: [PATCH 3/5] maint: fix printf format for signed integers With GCC 5 and the newly added warnings from gnulib, ensure the correct signed integer is passed for the printf format, to avoid -Werror=format= failures. --- src/dd.c | 2 +- src/factor.c | 2 +- src/kill.c | 4 ++-- src/make-prime-list.c | 2 +- src/numfmt.c | 4 ++-- src/split.c | 2 +- src/timeout.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/dd.c b/src/dd.c index 321b096..6b09bc6 100644 --- a/src/dd.c +++ b/src/dd.c @@ -1685,7 +1685,7 @@ skip_via_lseek (char const *filename, int fdesc, off_t offset, int whence) error (0, 0, _("warning: working around lseek kernel bug for file " "(%s)\n of mt_type=0x%0lx -- " "see <sys/mtio.h> for the list of types"), - filename, s2.mt_type); + filename, s2.mt_type + 0Lu); errno = 0; new_position = -1; } diff --git a/src/factor.c b/src/factor.c index f694534..4e4d0c7 100644 --- a/src/factor.c +++ b/src/factor.c @@ -2337,7 +2337,7 @@ print_uintmaxes (uintmax_t t1, uintmax_t t0) r = t1 % 1000000000; udiv_qrnnd (t0, r, r, t0, 1000000000); print_uintmaxes (q, t0); - printf ("%09u", (int) r); + printf ("%09u", (unsigned int) r); } } diff --git a/src/kill.c b/src/kill.c index 49e6ef6..83016ed 100644 --- a/src/kill.c +++ b/src/kill.c @@ -109,8 +109,8 @@ PID is an integer; if negative it identifies a process group.\n\ maximum name width is NAME_WIDTH, and SIGNAME is the name to print. */ static void -print_table_row (unsigned int num_width, int signum, - unsigned int name_width, char const *signame) +print_table_row (int num_width, int signum, + int name_width, char const *signame) { char const *description = strsignal (signum); printf ("%*d %-*s %s\n", num_width, signum, name_width, signame, diff --git a/src/make-prime-list.c b/src/make-prime-list.c index 69b91e8..b31e1ed 100644 --- a/src/make-prime-list.c +++ b/src/make-prime-list.c @@ -131,7 +131,7 @@ output_primes (const struct prime *primes, unsigned nprimes) abort (); printf ("P (%u, %u,\n (", primes[i].p - p, d8); print_wide_uint (primes[i].pinv, 0, wide_uint_bits); - printf ("),\n UINTMAX_MAX / %d)\n", primes[i].p); + printf ("),\n UINTMAX_MAX / %u)\n", primes[i].p); p = primes[i].p; } diff --git a/src/numfmt.c b/src/numfmt.c index 550e384..9cbcb27 100644 --- a/src/numfmt.c +++ b/src/numfmt.c @@ -729,7 +729,7 @@ double_to_human (long double val, int precision, /* Normalize val to scale. */ unsigned int power = 0; val = expld (val, scale_base, &power); - devmsg (" scaled value to %Lf * %0.f ^ %d\n", val, scale_base, power); + devmsg (" scaled value to %Lf * %0.f ^ %u\n", val, scale_base, power); /* Perform rounding. */ int ten_or_less = 0; @@ -757,7 +757,7 @@ double_to_human (long double val, int precision, int show_decimal_point = (val != 0) && (absld (val) < 10) && (power > 0); /* && (absld (val) > simple_round_floor (val))) */ - devmsg (" after rounding, value=%Lf * %0.f ^ %d\n", val, scale_base, power); + devmsg (" after rounding, value=%Lf * %0.f ^ %u\n", val, scale_base, power); stpcpy (pfmt, show_decimal_point ? ".1Lf%s" : ".0Lf%s"); diff --git a/src/split.c b/src/split.c index 8d03c16..e0f8369 100644 --- a/src/split.c +++ b/src/split.c @@ -521,7 +521,7 @@ closeout (FILE *fp, int fd, pid_t pid, char const *name) { /* shouldn't happen. */ error (EXIT_FAILURE, 0, - _("unknown status from command (0x%X)"), wstatus); + _("unknown status from command (0x%X)"), wstatus + 0u); } } } diff --git a/src/timeout.c b/src/timeout.c index 4d089bf..19c0765 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -492,7 +492,7 @@ main (int argc, char **argv) else { /* shouldn't happen. */ - error (0, 0, _("unknown status from command (0x%X)"), status); + error (0, 0, _("unknown status from command (%d)"), status); status = EXIT_FAILURE; } } -- 2.3.4
>From 17fba994bd1620ab5d4bdaeda797c6071f6130b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]> Date: Mon, 27 Apr 2015 10:27:16 +0100 Subject: [PATCH 2/5] build: update gnulib submodule to latest Fix file-has-acl build failure on RHEL/Centos 6. Fix GCC 5 warnings with printf and in fts.c. --- gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnulib b/gnulib index ff714c0..2aea2c7 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit ff714c0a2094bdefd9ed41603493e66aaf285f12 +Subproject commit 2aea2c723359d9459fd01e7b428f47656c9ce1e9 -- 2.3.4
>From 0dcde34931eb26161060b655d5c691350158d041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]> Date: Mon, 27 Apr 2015 10:14:14 +0100 Subject: [PATCH 1/5] build: reduce gettext dependency to 0.19.2 * bootstrap.conf: 0.19.2 is available on openSUSE-13.2, Debian-8.0, and Ubuntu-14.10. Given there were issues with earlier 0.19 gettext releases, set this as the new minimum. * configure.ac (AM_GNU_GETTEXT_VERSION): Likewise. Reported by Bernhard Voelker --- bootstrap.conf | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 75df5de..a16bd7c 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -319,9 +319,9 @@ gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests --symlink\ buildreq="\ autoconf 2.64 automake 1.11.2 -autopoint 0.19.4 +autopoint 0.19.2 bison - -gettext 0.19.4 +gettext 0.19.2 git 1.4.4 gperf - gzip - diff --git a/configure.ac b/configure.ac index 7959bf4..cac9ab2 100644 --- a/configure.ac +++ b/configure.ac @@ -590,7 +590,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.19.4]) +AM_GNU_GETTEXT_VERSION([0.19.2]) # For a test of uniq: it uses the $LOCALE_FR envvar. gt_LOCALE_FR -- 2.3.4
