Re: [bug #35580] bootstrap is not portable to OpenBSD

[Pádraig Brady]

On 08/08/2013 03:59 AM, Mike Miller wrote:
> Update of bug #35580 (project octave):
> 
>                 Category:                    None => Configuration and Build
> System
>               Item Group:                    None => Build Failure          
>                   Status:               Confirmed => Need Info              
>                  Summary: autogen.sh is not portable to OpenBSD => bootstrap
> is not portable to OpenBSD
> 
>     _______________________________________________________
> 
> Follow-up Comment #7:
> 
> Update: the development version of Octave uses a script called bootstrap now
> instead of autogen.sh.
> 
> I believe this can be considered fixed. I have a successful bootstrap of a
> current Octave hg clone on OpenBSD 5.3, the following GNU packages are
> required to be installed for bootstrap to succeed: autoconf (2.69p0), automake
> (1.13.1), coreutils, libtool, m4.
> 
> I don't know for certain that GNU m4 is required, but I think I read in the
> autoconf manual at one time that it is, so I installed it and set M4=gm4 in my
> environment. Coreutils is required for gsha1sum only.
> 
> You can certainly follow up with gnulib upstream if you want them to consider
> using OpenBSD's sha1 instead of gsha1sum, but the bootstrap script currently
> uses the --status option that is GNU-specific.

This adjustment should avoid the need for coreutils
(there might be a catch 22 with that requirement).
You'll also need to export SHA1SUM=sha1 before running bootstrap.

thanks,
Pádraig.

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 9c52204..3c8631c 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -692,8 +692,7 @@ update_po_files() {
     cksum_file="$ref_po_dir/$po.s1"
     if ! test -f "$cksum_file" ||
         ! test -f "$po_dir/$po.po" ||
-        ! $SHA1SUM -c --status "$cksum_file" \
-            < "$new_po" > /dev/null; then
+        ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then
       echo "$me: updated $po_dir/$po.po..."
       cp "$new_po" "$po_dir/$po.po" \
           && $SHA1SUM < "$new_po" > "$cksum_file"