mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-21 18:23:03 +00:00
gnulib: update
Fixes the `make install-pdf` problem reported by Hans Åberg in http://lists.gnu.org/archive/html/bug-bison/2018-06/msg00000.html that had already been fixed by Joel E. Denny in http://lists.gnu.org/archive/html/bug-bison/2012-04/msg00011.html Final fix in http://lists.gnu.org/archive/html/bug-gnulib/2018-06/msg00019.html
This commit is contained in:
48
bootstrap
48
bootstrap
@@ -1,6 +1,6 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Print a version string.
|
# Print a version string.
|
||||||
scriptversion=2018-04-28.14; # UTC
|
scriptversion=2018-05-27.20; # UTC
|
||||||
|
|
||||||
# Bootstrap this package from checked-out sources.
|
# Bootstrap this package from checked-out sources.
|
||||||
|
|
||||||
@@ -47,6 +47,8 @@ PERL="${PERL-perl}"
|
|||||||
|
|
||||||
me=$0
|
me=$0
|
||||||
|
|
||||||
|
default_gnulib_url=git://git.sv.gnu.org/gnulib
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
Usage: $me [OPTION]...
|
Usage: $me [OPTION]...
|
||||||
@@ -76,6 +78,37 @@ contents are read as shell variables to configure the bootstrap.
|
|||||||
For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
|
For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
|
||||||
are honored.
|
are honored.
|
||||||
|
|
||||||
|
Gnulib sources can be fetched in various ways:
|
||||||
|
|
||||||
|
* If this package is in a git repository with a 'gnulib' submodule
|
||||||
|
configured, then that submodule is initialized and updated and sources
|
||||||
|
are fetched from there. If \$GNULIB_SRCDIR is set (directly or via
|
||||||
|
--gnulib-srcdir) and is a git repository, then it is used as a reference.
|
||||||
|
|
||||||
|
* Otherwise, if \$GNULIB_SRCDIR is set (directly or via --gnulib-srcdir),
|
||||||
|
then sources are fetched from that local directory. If it is a git
|
||||||
|
repository and \$GNULIB_REVISION is set, then that revision is checked
|
||||||
|
out.
|
||||||
|
|
||||||
|
* Otherwise, if this package is in a git repository with a 'gnulib'
|
||||||
|
submodule configured, then that submodule is initialized and updated and
|
||||||
|
sources are fetched from there.
|
||||||
|
|
||||||
|
* Otherwise, if the 'gnulib' directory does not exist, Gnulib sources are
|
||||||
|
cloned into that directory using git from \$GNULIB_URL, defaulting to
|
||||||
|
$default_gnulib_url.
|
||||||
|
If \$GNULIB_REVISION is set, then that revision is checked out.
|
||||||
|
|
||||||
|
* Otherwise, the existing Gnulib sources in the 'gnulib' directory are
|
||||||
|
used. If it is a git repository and \$GNULIB_REVISION is set, then that
|
||||||
|
revision is checked out.
|
||||||
|
|
||||||
|
If you maintain a package and want to pin a particular revision of the
|
||||||
|
Gnulib sources that has been tested with your package, then there are two
|
||||||
|
possible approaches: either configure a 'gnulib' submodule with the
|
||||||
|
appropriate revision, or set \$GNULIB_REVISION (and if necessary
|
||||||
|
\$GNULIB_URL) in $me.conf.
|
||||||
|
|
||||||
Running without arguments will suffice in most cases.
|
Running without arguments will suffice in most cases.
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
@@ -634,9 +667,11 @@ if $use_gnulib; then
|
|||||||
trap cleanup_gnulib 1 2 13 15
|
trap cleanup_gnulib 1 2 13 15
|
||||||
|
|
||||||
shallow=
|
shallow=
|
||||||
git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
|
if test -z "$GNULIB_REVISION"; then
|
||||||
git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
|
git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
|
||||||
cleanup_gnulib
|
fi
|
||||||
|
git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
|
||||||
|
|| cleanup_gnulib
|
||||||
|
|
||||||
trap - 1 2 13 15
|
trap - 1 2 13 15
|
||||||
fi
|
fi
|
||||||
@@ -671,6 +706,11 @@ if $use_gnulib; then
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
|
||||||
|
&& ! git_modules_config submodule.gnulib.url >/dev/null; then
|
||||||
|
(cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib
|
||||||
|
fi
|
||||||
|
|
||||||
# $GNULIB_SRCDIR now points to the version of gnulib to use, and
|
# $GNULIB_SRCDIR now points to the version of gnulib to use, and
|
||||||
# we no longer need to use git or $gnulib_path below here.
|
# we no longer need to use git or $gnulib_path below here.
|
||||||
|
|
||||||
|
|||||||
2
gnulib
2
gnulib
Submodule gnulib updated: 0d10473be6...0d45ec7c03
3
lib/.gitignore
vendored
3
lib/.gitignore
vendored
@@ -36,7 +36,6 @@
|
|||||||
/closeout.h
|
/closeout.h
|
||||||
/concat-filename.c
|
/concat-filename.c
|
||||||
/concat-filename.h
|
/concat-filename.h
|
||||||
/config.charset
|
|
||||||
/config.h
|
/config.h
|
||||||
/config.in.h
|
/config.in.h
|
||||||
/configmake.h
|
/configmake.h
|
||||||
@@ -159,9 +158,7 @@
|
|||||||
/rawmemchr.valgrind
|
/rawmemchr.valgrind
|
||||||
/realloc.c
|
/realloc.c
|
||||||
/ref-add.sed
|
/ref-add.sed
|
||||||
/ref-add.sin
|
|
||||||
/ref-del.sed
|
/ref-del.sed
|
||||||
/ref-del.sin
|
|
||||||
/sched.h
|
/sched.h
|
||||||
/sched.in.h
|
/sched.in.h
|
||||||
/sig-handler.c
|
/sig-handler.c
|
||||||
|
|||||||
Reference in New Issue
Block a user