Changeset 30895

Show
Ignore:
Timestamp:
21.10.2016 16:59:13 (3 years ago)
Author:
ak19
Message:

Tidier way to set LDFLAGS and not exporting it this time, in case it has some unexpected side-effect.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/build-src/packages/configure

    r30894 r30895  
    162162 
    163163  cd "$PACKAGES/wv" 
    164   OLD_LD="$LDFLAGS" 
    165164  if [ "x$GSDLOS" = "xdarwin" ]; then 
    166     export LDFLAGS="$LDFLAGS -framework CoreFoundation -framework Carbon" 
     165    WV_LDFLAGS="$LDFLAGS -framework CoreFoundation -framework Carbon" 
     166  else 
     167    WV_LDFLAGS="$LDFLAGS" 
    167168  fi 
    168169  gzip -dc wv-1.2.4-gs.tar.gz | tar -xf -   
    169170  cd wv-gs && \ 
    170   ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS --disable-shared --enable-static LDFLAGS="$LDFLAGS" 
    171   export LDFLAGS="$OLD_LD" 
     171  ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS --disable-shared --enable-static LDFLAGS="$WV_LDFLAGS" 
    172172else 
    173173  echo "wvWare support disabled."