summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-12-16 08:11:35 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-12-16 08:12:22 -0800
commitf74595aace4b1240402562b0073b06c170969327 (patch)
treecd50bca64305e2fca5d4fa518e102e530a8b54ef /build-aux
parent07d8827946f9364180f18d6842acc80f0997ed75 (diff)
downloademacs-f74595aace4b1240402562b0073b06c170969327.tar.gz
Update from Gnulib
This incorporates: 2018-12-16 regex: propagate fix for glibc bug 18040 2018-12-16 obstack, libc-config: Support HP-UX cc in C99 mode 2018-12-15 regex: work around a bug in glibc-2.27 and prior 2018-12-13 localtime-buffer: Avoid endless recursion * build-aux/config.guess, build-aux/config.sub, lib/cdefs.h: * lib/gettext.h, lib/localtime-buffer.c, lib/regexec.c, m4/regex.m4: Copy from Gnulib.
Diffstat (limited to 'build-aux')
-rwxr-xr-xbuild-aux/config.guess5
-rwxr-xr-xbuild-aux/config.sub6
2 files changed, 5 insertions, 6 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 47d7bed50c5..94c4ac154a3 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-11-28'
+timestamp='2018-12-07'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -96,8 +96,7 @@ fi
tmp=
# shellcheck disable=SC2172
-trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
-trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
set_cc_for_build() {
: "${TMPDIR=/tmp}"
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 46708056af3..a5081b8e0d1 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-11-28'
+timestamp='2018-12-16'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -111,7 +111,7 @@ case $# in
esac
# Split fields of configuration type
-IFS="-" read -r field1 field2 field3 field4 <<EOF
+IFS="-" read field1 field2 field3 field4 <<EOF
$1
EOF
@@ -918,7 +918,7 @@ case $basic_machine in
;;
*-*)
- IFS="-" read -r cpu vendor <<EOF
+ IFS="-" read cpu vendor <<EOF
$basic_machine
EOF
;;