Re: bootstrap, sha1sum, gsha1sum and such things?

[Thomas Treichl]

Shai Ayal schrieb:
> 2009/12/15 Thomas Treichl <address@hidden>:
> > Tatsuro MATSUOKA schrieb:
> > > Hello
> > >
> > > > Is a working gnulib already needed?
> > > It seem that libtool, sha1sum, git are required to execute ./autogen.sh for 
> > > building from the current
> > > Mercurial development source.
> > > The git access the website and download gnulib
> > >
> > > *********
> > > bootstrapping...
> > > ./bootstrap: Bootstrapping from checked-out octave sources...
> > > ./bootstrap: getting gnulib files...
> > > Initialized empty Git repository in
> > > /cygdrive/d/usr/Tatsu/mingwhome/octaves/hg/octave-work/gnulib/.git/
> > > remote: Counting objects: 18462, done.
> > > remote: Compressing objects: 100% (9041/9041), done.
> > > Receiving objects:  46% (8493/18462), 4.78 MiB | 255 KiB/s
> > > ***********
> > >
> > >
> > > In my case (MinGW), I use cygwin to use the above tools.
> > > The symbolic links cannot be used in MinGW so that they were replaced by copy 
> > > files.
> > >
> > > My trial is stopped to build liboctave stage because of shared library problem.
> > >
> > > Regards
> > >
> > > Tatsuro
> > Ok, thanks. Does this mean that we always need a working Internet connection to
> > configure the Octave sources because we need to bootstrap? Or, if I have gnulib
> > installed I don't need to bootstrap anymore?
>
> If you have gnulib installed, you can use the  --gnulib-srcdir option
> to autogen.sh to point to your installation.
>
> ./autogen.sh --gnulib-srcdir=/path/to/gnulib-tool
>
> Shai

Ok, now either bootstrap is not working as expected on my Mac (why is it still 
checking for sha1sum if I tell it to use my local copy) or maybe there is some 
platform specifics in it?!

  MyMac:~/Development/octave Me$ ls /Users/Me/src/gnulib-20091120-stable/
  COPYING         Makefile        build-aux       gnulib-tool     posix-modules
  ChangeLog       NEWS            check-module    lib             tests
  DEPENDENCIES    NEWS.stable     config          m4              top
  MODULES.html.sh README          doc             modules         users.txt

  MyMac:~/Development/octave Me$ ./bootstrap
  --gnulib-srcdir=/Users/Me/src/gnulib-20091120-stable
  ./bootstrap: one of these is required: sha1sum gsha1sum

Ha, brain flash ;) Got it. It works now, thanks Shai and Tatsuro! Someone needs 
to change that bootstrap file - the file always checks for sha1sum and such, 
even if I tell the program to use the local copy... I therefore changed the line 
191 of bootstrap

  # Find sha1sum, named gsha1sum on MacPorts.
  find_tool SHA1SUM sha1sum gsha1sum

into this

  # Find sha1sum, named gsha1sum on MacPorts.
  if test x"$GNULIB_SRCDIR" = x; then
    find_tool SHA1SUM sha1sum gsha1sum
  fi

and also moved these lines under the options parsing... A simple "hg diff 
bootstrap >bootstrap.diff" is attached, does this work on other systems and is 
this the best solution?

  Thomas

diff -r bb30843c4929 bootstrap
--- a/bootstrap Tue Dec 15 10:05:38 2009 +0100
+++ b/bootstrap Tue Dec 15 13:57:58 2009 +0100
@@ -188,9 +188,6 @@
   eval "export $find_tool_envvar"
 }
 
-# Find sha1sum, named gsha1sum on MacPorts.
-find_tool SHA1SUM sha1sum gsha1sum
-
 # Override the default configuration, if necessary.
 # Make sure that bootstrap.conf is sourced from the current directory
 # if we were invoked as "sh bootstrap".
@@ -233,6 +230,11 @@
 if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
   echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
   exit 1
+fi
+
+# Find sha1sum, named gsha1sum on MacPorts.
+if test x"$GNULIB_SRCDIR" = x; then
+  find_tool SHA1SUM sha1sum gsha1sum
 fi
 
 # If $STR is not already on a line by itself in $FILE, insert it,