Changeset 30895

Timestamp:

2016-10-21T16:59:13+13:00 (7 years ago)

Author:

ak19

Message:

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

File:

• main/trunk/greenstone2/build-src/packages/configure (modified) (1 diff)

main/trunk/greenstone2/build-src/packages/configure

@@ -162 +162 @@
 
   cd "$PACKAGES/wv"
-  OLD_LD="$LDFLAGS"
   if [ "x$GSDLOS" = "xdarwin" ]; then
-    export LDFLAGS="$LDFLAGS -framework CoreFoundation -framework Carbon"
+    WV_LDFLAGS="$LDFLAGS -framework CoreFoundation -framework Carbon"
+  else
+    WV_LDFLAGS="$LDFLAGS"
   fi
   gzip -dc wv-1.2.4-gs.tar.gz | tar -xf -  
   cd wv-gs && \
-  ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS --disable-shared --enable-static LDFLAGS="$LDFLAGS"
-  export LDFLAGS="$OLD_LD"
+  ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS --disable-shared --enable-static LDFLAGS="$WV_LDFLAGS"
 else
   echo "wvWare support disabled."