2012-11-06 00:06:31 +01:00
|
|
|
#! /bin/sh
|
|
|
|
|
2017-01-01 07:50:51 +01:00
|
|
|
# Copyright (C) 2011-2017 Free Software Foundation, Inc.
|
2012-11-06 00:06:31 +01:00
|
|
|
#
|
|
|
|
# This file is part of GDB.
|
|
|
|
#
|
|
|
|
# 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
|
|
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
# Usage: update-gnulib.sh <path-to-gnulib-repository>
|
|
|
|
# Update our import of gnulib in the GDB source tree.
|
|
|
|
#
|
|
|
|
# This script assumes that it is being called from the gdb/gnulib
|
|
|
|
# subdirectory, and will verify this before proceeding.
|
|
|
|
#
|
|
|
|
# This script will also make a number of other verifications:
|
|
|
|
# . The gnulib version (it should match $GNULIB_COMMIT_SHA1).
|
|
|
|
# . The correct versions of the auto-tools that are used to
|
|
|
|
# regenerate the various scripts and Makefiles are on the PATH.
|
|
|
|
|
|
|
|
# The list of gnulib modules we are importing in GDB.
|
2013-11-05 22:49:14 +01:00
|
|
|
IMPORTED_GNULIB_MODULES="\
|
2014-11-21 15:05:41 +01:00
|
|
|
alloca \
|
2014-11-23 15:02:50 +01:00
|
|
|
canonicalize-lgpl \
|
2014-11-21 15:05:41 +01:00
|
|
|
dirent \
|
2014-05-16 20:26:33 +02:00
|
|
|
dirfd \
|
2014-11-21 15:05:42 +01:00
|
|
|
errno \
|
2013-11-05 22:49:14 +01:00
|
|
|
fnmatch-gnu \
|
|
|
|
frexpl \
|
|
|
|
inttypes \
|
2014-11-23 14:54:45 +01:00
|
|
|
lstat \
|
Update gnulib to current upstream master
I tried building gdb with G++ 4.7 and CXX="g++ -std=gnu+11", and that
tripped on a build error:
In file included from build-gnulib/import/stdio.h:53:0,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20:
build-gnulib/import/stddef.h:104:3: error: conflicting declaration ‘typedef union max_align_t max_align_t’
In file included from build-gnulib/import/stddef.h:55:0,
from build-gnulib/import/stdio.h:53,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28,
from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20:
/opt/gcc-4.7/lib/gcc/x86_64-unknown-linux-gnu/4.7.4/include/stddef.h:426:3: error: ‘max_align_t’ has a previous declaration as ‘typedef struct max_align_t max_align_t’
Updating gnulib to current master fixes it, since it brings in this
fix:
http://lists.gnu.org/archive/html/bug-gnulib/2016-04/msg00000.html
Our last update was in August 2015. This doesn't bring in much added
baggage, it's mostly bug fixes. It pulled in the "limits-h" module as
automatic dependency, and given that looks potentially useful I added
it to the set of modules we require.
Tested on x86_64 Fedora 23, with g++ 4.7 and g++ 5.3, native and gdbserver.
gdb/ChangeLog:
2016-10-18 Pedro Alves <palves@redhat.com>
* gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to
2692e23a48e21f6daa029e8af9f1a143b7532f47.
* gnulib/configure, gnulib/config.in, gnulib/aclocal.m4:
Regenerate.
* gnulib/import/Makefile: Update.
* gnulib/import/alloca: Update.
* gnulib/import/basename-lgpl: Update.
* gnulib/import/canonicalize-lgpl: Update.
* gnulib/import/config: Update.
* gnulib/import/dirent: Update.
* gnulib/import/dirfd: Update.
* gnulib/import/dirname-lgpl: Update.
* gnulib/import/dirname.h: Update.
* gnulib/import/dosname.h: Update.
* gnulib/import/errno: Update.
* gnulib/import/extra/snippet/arg-nonnull.h: Update.
* gnulib/import/extra/snippet/c++defs.h: Update.
* gnulib/import/extra/snippet/warn-on-use.h: Update.
* gnulib/import/extra/update-copyright: Update.
* gnulib/import/flexmember.h: Update.
* gnulib/import/float+.h: Update.
* gnulib/import/float: Update.
* gnulib/import/float: Update.
* gnulib/import/fnmatch: Update.
* gnulib/import/fnmatch: Update.
* gnulib/import/fnmatch_loop: Update.
* gnulib/import/fpucw.h: Update.
* gnulib/import/frexp: Update.
* gnulib/import/frexpl: Update.
* gnulib/import/gettimeofday: Update.
* gnulib/import/hard-locale: Update.
* gnulib/import/hard-locale.h: Update.
* gnulib/import/inttypes: Update.
* gnulib/import/isnan: Update.
* gnulib/import/isnand-nolibm.h: Update.
* gnulib/import/isnand: Update.
* gnulib/import/isnanl-nolibm.h: Update.
* gnulib/import/isnanl: Update.
* gnulib/import/itold: Update.
* gnulib/import/limits: Update.
* gnulib/import/localcharset: Update.
* gnulib/import/localcharset.h: Update.
* gnulib/import/lstat: Update.
* gnulib/import/m4/00gnulib: Update.
* gnulib/import/m4/absolute-header: Update.
* gnulib/import/m4/alloca: Update.
* gnulib/import/m4/canonicalize: Update.
* gnulib/import/m4/codeset: Update.
* gnulib/import/m4/configmake: Update.
* gnulib/import/m4/dirent_h: Update.
* gnulib/import/m4/dirfd: Update.
* gnulib/import/m4/dirname: Update.
* gnulib/import/m4/double-slash-root: Update.
* gnulib/import/m4/eealloc: Update.
* gnulib/import/m4/errno_h: Update.
* gnulib/import/m4/exponentd: Update.
* gnulib/import/m4/exponentl: Update.
* gnulib/import/m4/extensions: Update.
* gnulib/import/m4/extern-inline: Update.
* gnulib/import/m4/fcntl-o: Update.
* gnulib/import/m4/flexmember: Update.
* gnulib/import/m4/float_h: Update.
* gnulib/import/m4/fnmatch: Update.
* gnulib/import/m4/fpieee: Update.
* gnulib/import/m4/frexp: Update.
* gnulib/import/m4/frexpl: Update.
* gnulib/import/m4/gettimeofday: Update.
* gnulib/import/m4/glibc21: Update.
* gnulib/import/m4/gnulib-cache: Update.
* gnulib/import/m4/gnulib-common: Update.
* gnulib/import/m4/gnulib-comp: Update.
* gnulib/import/m4/gnulib-tool: Update.
* gnulib/import/m4/hard-locale: Update.
* gnulib/import/m4/include_next: Update.
* gnulib/import/m4/inttypes-pri: Update.
* gnulib/import/m4/inttypes: Update.
* gnulib/import/m4/isnand: Update.
* gnulib/import/m4/isnanl: Update.
* gnulib/import/m4/largefile: Update.
* gnulib/import/m4/limits-h: Update.
* gnulib/import/m4/localcharset: Update.
* gnulib/import/m4/locale-fr: Update.
* gnulib/import/m4/locale-ja: Update.
* gnulib/import/m4/locale-zh: Update.
* gnulib/import/m4/longlong: Update.
* gnulib/import/m4/lstat: Update.
* gnulib/import/m4/malloc: Update.
* gnulib/import/m4/malloca: Update.
* gnulib/import/m4/math_h: Update.
* gnulib/import/m4/mbrtowc: Update.
* gnulib/import/m4/mbsinit: Update.
* gnulib/import/m4/mbsrtowcs: Update.
* gnulib/import/m4/mbstate_t: Update.
* gnulib/import/m4/memchr: Update.
* gnulib/import/m4/memmem: Update.
* gnulib/import/m4/mmap-anon: Update.
* gnulib/import/m4/multiarch: Update.
* gnulib/import/m4/nocrash: Update.
* gnulib/import/m4/off_t: Update.
* gnulib/import/m4/pathmax: Update.
* gnulib/import/m4/rawmemchr: Update.
* gnulib/import/m4/readlink: Update.
* gnulib/import/m4/rename: Update.
* gnulib/import/m4/rmdir: Update.
* gnulib/import/m4/signal_h: Update.
* gnulib/import/m4/ssize_t: Update.
* gnulib/import/m4/stat: Update.
* gnulib/import/m4/stdbool: Update.
* gnulib/import/m4/stddef_h: Update.
* gnulib/import/m4/stdint: Update.
* gnulib/import/m4/stdio_h: Update.
* gnulib/import/m4/stdlib_h: Update.
* gnulib/import/m4/strchrnul: Update.
* gnulib/import/m4/string_h: Update.
* gnulib/import/m4/strstr: Update.
* gnulib/import/m4/strtok_r: Update.
* gnulib/import/m4/sys_socket_h: Update.
* gnulib/import/m4/sys_stat_h: Update.
* gnulib/import/m4/sys_time_h: Update.
* gnulib/import/m4/sys_types_h: Update.
* gnulib/import/m4/time_h: Update.
* gnulib/import/m4/unistd_h: Update.
* gnulib/import/m4/warn-on-use: Update.
* gnulib/import/m4/wchar_h: Update.
* gnulib/import/m4/wchar_t: Update.
* gnulib/import/m4/wctype_h: Update.
* gnulib/import/m4/wint_t: Update.
* gnulib/import/malloc: Update.
* gnulib/import/malloca: Update.
* gnulib/import/malloca.h: Update.
* gnulib/import/math: Update.
* gnulib/import/math: Update.
* gnulib/import/mbrtowc: Update.
* gnulib/import/mbsinit: Update.
* gnulib/import/mbsrtowcs-impl.h: Update.
* gnulib/import/mbsrtowcs-state: Update.
* gnulib/import/mbsrtowcs: Update.
* gnulib/import/memchr: Update.
* gnulib/import/memmem: Update.
* gnulib/import/pathmax.h: Update.
* gnulib/import/rawmemchr: Update.
* gnulib/import/readlink: Update.
* gnulib/import/ref-add.sin: Update.
* gnulib/import/ref-del.sin: Update.
* gnulib/import/rename: Update.
* gnulib/import/rmdir: Update.
* gnulib/import/same-inode.h: Update.
* gnulib/import/signal: Update.
* gnulib/import/stat: Update.
* gnulib/import/stdbool: Update.
* gnulib/import/stddef: Update.
* gnulib/import/stdint: Update.
* gnulib/import/stdio: Update.
* gnulib/import/stdlib: Update.
* gnulib/import/str-two-way.h: Update.
* gnulib/import/strchrnul: Update.
* gnulib/import/streq.h: Update.
* gnulib/import/string: Update.
* gnulib/import/stripslash: Update.
* gnulib/import/strnlen1: Update.
* gnulib/import/strnlen1.h: Update.
* gnulib/import/strstr: Update.
* gnulib/import/strtok_r: Update.
* gnulib/import/sys_stat: Update.
* gnulib/import/sys_time: Update.
* gnulib/import/sys_types: Update.
* gnulib/import/time: Update.
* gnulib/import/unistd: Update.
* gnulib/import/unistd: Update.
* gnulib/import/verify.h: Update.
* gnulib/import/wchar: Update.
* gnulib/import/wctype: Update.
* gnulib/import/flexmember.h: New file.
* gnulib/import/hard-locale.c: New file.
* gnulib/import/hard-locale.h: New file.
* gnulib/import/limits.in.h: New file.
* gnulib/import/m4/flexmember.m4: New file.
* gnulib/import/m4/hard-locale.m4: New file.
* gnulib/import/m4/limits-h.m4: New file.
2016-10-18 18:18:29 +02:00
|
|
|
limits-h \
|
2014-11-21 15:05:41 +01:00
|
|
|
memchr \
|
2013-11-05 22:49:14 +01:00
|
|
|
memmem \
|
|
|
|
pathmax \
|
2016-01-28 19:49:46 +01:00
|
|
|
rawmemchr \
|
2014-11-23 14:49:20 +01:00
|
|
|
readlink \
|
2014-11-23 15:19:49 +01:00
|
|
|
rename \
|
2015-08-27 14:26:22 +02:00
|
|
|
signal-h \
|
2016-01-28 16:28:56 +01:00
|
|
|
strchrnul \
|
2013-11-05 22:53:48 +01:00
|
|
|
strstr \
|
2015-04-08 19:10:21 +02:00
|
|
|
strtok_r \
|
2013-11-06 15:49:44 +01:00
|
|
|
sys_stat \
|
2014-11-21 15:05:41 +01:00
|
|
|
unistd \
|
|
|
|
update-copyright \
|
2014-11-21 15:05:41 +01:00
|
|
|
wchar \
|
|
|
|
wctype-h \
|
2013-11-05 22:49:14 +01:00
|
|
|
"
|
2012-11-06 00:06:31 +01:00
|
|
|
|
|
|
|
# The gnulib commit ID to use for the update.
|
2016-11-15 20:29:14 +01:00
|
|
|
GNULIB_COMMIT_SHA1="38237baf99386101934cd93278023aa4ae523ec0"
|
2012-11-06 00:06:31 +01:00
|
|
|
|
|
|
|
# The expected version number for the various auto tools we will
|
|
|
|
# use after the import.
|
|
|
|
AUTOCONF_VERSION="2.64"
|
|
|
|
AUTOMAKE_VERSION="1.11.1"
|
|
|
|
ACLOCAL_VERSION="$AUTOMAKE_VERSION"
|
|
|
|
|
|
|
|
if [ $# -ne 1 ]; then
|
|
|
|
echo "Error: Path to gnulib repository missing. Aborting."
|
|
|
|
echo "Usage: update-gnulib.sh <path-to-gnulib-repository>"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
gnulib_prefix=$1
|
|
|
|
|
|
|
|
gnulib_tool="$gnulib_prefix/gnulib-tool"
|
|
|
|
|
|
|
|
# Verify that the gnulib directory does exist...
|
|
|
|
if [ ! -f "$gnulib_tool" ]; then
|
|
|
|
echo "Error: Invalid gnulib directory. Cannot find gnulib tool"
|
|
|
|
echo " ($gnulib_tool)."
|
|
|
|
echo "Aborting."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Verify that we have the right version of gnulib...
|
|
|
|
gnulib_head_sha1=`cd $gnulib_prefix && git rev-parse HEAD`
|
|
|
|
if [ "$gnulib_head_sha1" != "$GNULIB_COMMIT_SHA1" ]; then
|
|
|
|
echo "Error: Wrong version of gnulib: $gnulib_head_sha1"
|
|
|
|
echo " (we expected it to be $GNULIB_COMMIT_SHA1)"
|
|
|
|
echo "Aborting."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Verify that we are in the gdb/ subdirectory.
|
|
|
|
if [ ! -f ../main.c -o ! -d import ]; then
|
|
|
|
echo "Error: This script should be called from the gdb/gnulib subdirectory."
|
|
|
|
echo "Aborting."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Verify that we have the correct version of autoconf.
|
|
|
|
ver=`autoconf --version 2>&1 | head -1 | sed 's/.*) //'`
|
|
|
|
if [ "$ver" != "$AUTOCONF_VERSION" ]; then
|
|
|
|
echo "Error: Wrong autoconf version: $ver. Aborting."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Verify that we have the correct version of automake.
|
|
|
|
ver=`automake --version 2>&1 | head -1 | sed 's/.*) //'`
|
|
|
|
if [ "$ver" != "$AUTOMAKE_VERSION" ]; then
|
|
|
|
echo "Error: Wrong automake version ($ver), we need $AUTOMAKE_VERSION."
|
|
|
|
echo "Aborting."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Verify that we have the correct version of aclocal.
|
2015-04-09 11:35:29 +02:00
|
|
|
#
|
|
|
|
# The grep below is needed because Perl >= 5.16 dumps a "called too
|
|
|
|
# early to check prototype" warning when running aclocal 1.11.1. This
|
|
|
|
# causes trouble below, because the warning is the first line output
|
|
|
|
# by aclocal, resulting in:
|
|
|
|
#
|
|
|
|
# $ sh ./update-gnulib.sh ~/src/gnulib/src/
|
|
|
|
# Error: Wrong aclocal version: called too early to check prototype at /opt/automake-1.11.1/bin/aclocal line 617.. Aborting.
|
|
|
|
#
|
|
|
|
# Some distros carry an automake patch for that:
|
|
|
|
# https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=aclocal-function-prototypes.debdiff;att=1;bug=752784
|
|
|
|
#
|
|
|
|
# But since we prefer pristine FSF versions of autotools, work around
|
|
|
|
# the issue here. This can be removed later when we bump the required
|
|
|
|
# automake version.
|
|
|
|
#
|
|
|
|
ver=`aclocal --version 2>&1 | grep -v "called too early to check prototype" | head -1 | sed 's/.*) //'`
|
2012-11-06 00:06:31 +01:00
|
|
|
if [ "$ver" != "$ACLOCAL_VERSION" ]; then
|
|
|
|
echo "Error: Wrong aclocal version: $ver. Aborting."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Update our gnulib import.
|
|
|
|
$gnulib_prefix/gnulib-tool --import --dir=. --lib=libgnu \
|
|
|
|
--source-base=import --m4-base=import/m4 --doc-base=doc \
|
|
|
|
--tests-base=tests --aux-dir=import/extra \
|
|
|
|
--no-conditional-dependencies --no-libtool --macro-prefix=gl \
|
|
|
|
--no-vc-files \
|
|
|
|
$IMPORTED_GNULIB_MODULES
|
|
|
|
if [ $? -ne 0 ]; then
|
|
|
|
echo "Error: gnulib import failed. Aborting."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Regenerate all necessary files...
|
|
|
|
aclocal -Iimport/m4 &&
|
|
|
|
autoconf &&
|
2012-12-18 05:40:25 +01:00
|
|
|
autoheader &&
|
2012-11-06 00:06:31 +01:00
|
|
|
automake
|
|
|
|
if [ $? -ne 0 ]; then
|
|
|
|
echo "Error: Failed to regenerate Makefiles and configure scripts."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|