Changeset 26619

Show
Ignore:
Timestamp:
09.01.2013 14:14:39 (6 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:
1 added
1 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/LIBZ.sh

    r23150 r26619  
    22 
    33package=zlib 
    4 version=-1.2.5 
     4version=-1.2.7 
    55 
    66progname=$0 
     
    1010prefix=$GEXTGNOME_INSTALLED 
    1111 
     12if [ "x$CROSSCONFIGURE_ARGS" != "x" ] ; then 
     13  export LDSHAREDLIBC=-lcrtdll 
     14  # zlib configure does not support '--host' 
     15  export CROSSCONFIGURE_ARGS= 
     16fi 
     17 
     18 
    1219opt_run_untar $force_untar $auto_untar $package $version 
    13 opt_run_configure $force_config $auto_config $package $version $prefix 
     20 
     21#opt_run_configure $force_config $auto_config $package $version $prefix 
     22 
     23if [ $auto_config = "1" ] ; then 
     24  if [ ! -f $package$version/configure.log] ; then 
     25    force_config=1 
     26  fi 
     27 
     28fi 
     29 
     30if [ $force_config = "1" ] ; then 
     31    echo "[pushd $package$version]" 
     32    ( cd $package$version ; \ 
     33      echo $CROSSCONFIGURE_VARS ./configure --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ ; \ 
     34      eval $CROSSCONFIGURE_VARS ./configure --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ ) 
     35    if [ $? != 0 ] ; then 
     36        echo "      Error encountered running *configure* stage of $progname" 
     37        exit 1 
     38    fi 
     39    echo "[popd]" 
     40  else 
     41    if [ $auto_config = "1" ] ; then 
     42      echo "Found top-level for ${progname%.*} => no need to run ./configure" 
     43    fi 
     44fi 
     45 
     46 
    1447 
    1548opt_run_make $compile $package $version