diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-01-01 01:19:57 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-12-31 17:21:33 -0800 |
| commit | 220a9ecba1b62e09703cb0a3c122797d4498ccc2 (patch) | |
| tree | 97d286479f4b8c15205f78e61635de9b93993707 /build-aux | |
| parent | 312c5655669a882186884626f0cf361de70e679d (diff) | |
| download | emacs-220a9ecba1b62e09703cb0a3c122797d4498ccc2.tar.gz | |
Merge from Gnulib
This incorporates:
2018-01-01 maint: Run 'make update-copyright'
2017-12-29 Add cross-compilation results for GNU/Hurd.
2017-12-12 explicit_bzero: port to macOS + Clang 9.0.0
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/config.guess | 5 | ||||
| -rwxr-xr-x | build-aux/config.sub | 2 | ||||
| -rwxr-xr-x | build-aux/gitlog-to-changelog | 2 | ||||
| -rwxr-xr-x | build-aux/move-if-change | 2 | ||||
| -rwxr-xr-x | build-aux/update-copyright | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess index 31e01efec3e..770cb5c7eb0 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2017-11-07' +timestamp='2017-12-17' # 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 @@ -265,6 +265,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:Redox:*:*) echo ${UNAME_MACHINE}-unknown-redox exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) diff --git a/build-aux/config.sub b/build-aux/config.sub index 00f68b8e5f3..4fa505b51aa 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1416,7 +1416,7 @@ case $os in | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 3c94bd56a0b..d8074aadabf 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -9,7 +9,7 @@ my $VERSION = '2017-09-13 06:45'; # UTC # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2008-2017 Free Software Foundation, Inc. +# Copyright (C) 2008-2018 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/move-if-change b/build-aux/move-if-change index 4a65145594c..f15923613c8 100755 --- a/build-aux/move-if-change +++ b/build-aux/move-if-change @@ -8,7 +8,7 @@ VERSION='2017-09-13 06:45'; # UTC # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 63455c37948..5b11e306cdc 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" "$@"' my $VERSION = '2017-09-13.06:45'; # UTC -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |