Changeset 26627

Timestamp:

2013-01-09T14:33:19+13:00 (11 years ago)

Author:

davidb

Message:

Support for cross-compiling added

File:

• other-projects/cascade-make/trunk/lib/cascade-lib.bash (modified) (4 diffs)

other-projects/cascade-make/trunk/lib/cascade-lib.bash

@@ -11 +11 @@
     GSDLOS=windows
   fi
+  if test ! -z $crossOS ; then
+    # Override derived value with value explicitly provided in crossOS
+    GSDLOS=$crossOS
+  fi
+
   echo "GSDLOS was not set.  Setting it to '$GSDLOS'"
   export GSDLOS
@@ -23 +28 @@
     eval exthome=`echo \\$$ext`
     if test -z "$exthome" ; then
-      echo "Environment variable $ext for Greenstone extension not set"
-      echo "Sourcing $reldir/setup.bash"
-      source $reldir/setup.bash
-
-      eval exthome=`echo \\$$ext`
+      if test -f $reldir/setup.bash ; then
+        echo "Environment variable $ext for Greenstone extension not set"
+        echo "Sourcing $reldir/setup.bash"
+        source $reldir/setup.bash
+      
+        eval exthome=`echo \\$$ext`
+      else
+     echo "Did not detect $reldir/setup.bash, Skipping"
+      fi
     fi
   fi
@@ -158 +167 @@
     echo "[pushd $package$version]"
     ( cd $package$version ; \
-      echo ./configure --prefix="$prefix" $CROSSCOMPILE $@ ; \
-      ./configure --prefix="$prefix" $CROSSCOMPILE $@ )
+      echo $CROSSCONFIGURE_VARS ./configure --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ ; 
+      eval $CROSSCONFIGURE_VARS ./configure --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ )
     if [ $? != 0 ] ; then
         echo "      Error encountered running *configure* stage of $progname"
@@ -288 +297 @@
     force_config=1
   fi
-
-fi
+fi