]> git.neil.brown.name Git - wiggle.git/commitdiff
FreeBSD/*BSD build fixes for wiggle attached and a bug
authorManpreet Singh <junkblocker@yahoo.com>
Sat, 6 Oct 2012 02:51:05 +0000 (19:51 -0700)
committerNeilBrown <neilb@suse.de>
Mon, 8 Oct 2012 06:17:00 +0000 (17:17 +1100)
To build wiggle on FreeBSD/*BSD/Mac

 a) endian.h must be included from machine/endian.h.
 b) A small fix to dotest is needed to avoid an infinite loop.
 c) bash may not always be at /usr/bin/bash

Signed-off-by: NeilBrown <neilb@suse.de>
config.h
dotest

index c574f5f41f04054812edba27195cda89f11bc291..ecf34119d2e135fc12c2f30d003f547f1c4b27af 100644 (file)
--- a/config.h
+++ b/config.h
@@ -2,7 +2,7 @@
 /* Includes and defines for ccan files */
 
 #if !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN)
- #ifdef __APPLE__
+ #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
   #include <machine/endian.h>
  #else
   #include <endian.h>
diff --git a/dotest b/dotest
index 18fdf05ccc6e586df6a53201300d2da37de947af..62ba094f87219e275bbf277db69bbfb766c8c9c1 100755 (executable)
--- a/dotest
+++ b/dotest
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Redirect for non-GNU time systems
 if [ "xx$TIME_CMD" = "xx" ]
@@ -12,11 +12,11 @@ dir=$PWD
 
 while [ ! -f $dir/wiggle ]
 do
-  case $dir in
-    / )    echo >&2 Cannot find wiggle program : $WIGGLE
-       exit 1;;
-    * ) dir=${dir%/*}
-  esac
+  if [ -z "$dir" ]; then
+    echo >&2 Cannot find wiggle program : $WIGGLE
+    exit 1
+  fi
+  dir=${dir%/*}
 done
 export WIGGLE=$dir/wiggle