Changeset 26619

Timestamp:

2013-01-09T14:14:39+13:00 (11 years ago)

Author:

davidb

Message:

Cross-compilation support added (mingw under Linux) which in turn needed the version of zlib used to be upgraded

Location:

gs2-extensions/gnome-lib/trunk/src/packages

Files:

• CASCADE-MAKE/LIBZ.sh (modified) (2 diffs)
• zlib-1.2.7.tar.gz (added)

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/LIBZ.sh

@@ -2 +2 @@
 
 package=zlib
-version=-1.2.5
+version=-1.2.7
 
 progname=$0
@@ -10 +10 @@
 prefix=$GEXTGNOME_INSTALLED
 
+if [ "x$CROSSCONFIGURE_ARGS" != "x" ] ; then
+  export LDSHAREDLIBC=-lcrtdll
+  # zlib configure does not support '--host'
+  export CROSSCONFIGURE_ARGS=
+fi
+
+
 opt_run_untar $force_untar $auto_untar $package $version
-opt_run_configure $force_config $auto_config $package $version $prefix
+
+#opt_run_configure $force_config $auto_config $package $version $prefix
+
+if [ $auto_config = "1" ] ; then
+  if [ ! -f $package$version/configure.log] ; then
+    force_config=1
+  fi
+
+fi
+
+if [ $force_config = "1" ] ; then
+    echo "[pushd $package$version]"
+    ( cd $package$version ; \
+      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"
+        exit 1
+    fi
+    echo "[popd]"
+  else
+    if [ $auto_config = "1" ] ; then
+      echo "Found top-level for ${progname%.*} => no need to run ./configure"
+    fi
+fi
+
+
 
 opt_run_make $compile $package $version