# HG changeset patch # User John W. Eaton # Date 1579820199 18000 # Thu Jan 23 17:56:39 2020 -0500 # Branch stable # Node ID db2cc9f1c14fd95da4934896130717ed12e70a7f # Parent 44a019d01aa5157de87f864d6a428e3769a4a965 eliminate gnulib subrepo (bug #57044) After this change, bootstrap will check out the gnulib sources to the revision set in the bootstrap.conf file. You may also use ./bootstrap --gnulib-srcdir=/path/to/gnulib to use an external copy of gnulib. If GNULIB_REVISION is unset, then the external repo will be updated to the version specified in bootstrap.conf. If GNULIB_REVISION is set in the environment when running bootstrap, that version will be used. If GNULIB_REVISION is set but empty, the current version in the external repo will be used: GNULIB_REVISION= ./bootstrap --gnulib-srcdir=/path/to/gnulib Thanks to Kai T. Ohlhus for the initial version of this change. * bootstrap.conf: Set GNULIB_REVISION unless it is already set in the environment. * .hgsub, .hgsubstate: Delete. diff --git a/.hgsub b/.hgsub deleted file mode 100644 --- a/.hgsub +++ /dev/null @@ -1,1 +0,0 @@ -gnulib = http://hg.octave.org/gnulib diff --git a/.hgsubstate b/.hgsubstate deleted file mode 100644 --- a/.hgsubstate +++ /dev/null @@ -1,1 +0,0 @@ -b64e28406423601fb61aab21a70030a3325a2050 gnulib diff --git a/bootstrap.conf b/bootstrap.conf --- a/bootstrap.conf +++ b/bootstrap.conf @@ -174,10 +174,14 @@ gnulib_tool_option_extras="--libtool" gnulib_name="libgnu" source_base="libgnu" -# Don't use git to update gnulib sources. We keep gnulib under a -# Mercurial subrepository instead. -use_git=false -GNULIB_SRCDIR=gnulib +# Go to https://git.savannah.gnu.org/cgit/gnulib.git to find out the latest +# revision ID. Paste it below and run +# +# ./bootstrap --bootstrap-sync +# +# To update the ./bootstrap file with that from ./gnulib/build-aux/bootstrap + +: ${GNULIB_REVISION=a8e125d24942bc581fda1628a61a60b979ab7087} # Don't check for translations since we don't have any in Octave yet. # This avoids the need for sha1sum or compatible utility in bootstrap.