Changeset 36468 for main/trunk

Timestamp:

2022-08-24T10:17:35+12:00 (20 months ago)

Author:

davidb

Message:

Change that is intended to fix rk2 build error with LDFLAGS=-static being set globally, but not liked by libz

File:

• main/trunk/greenstone2/build-src/packages/configure (modified) (2 diffs)

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

@@ -148 +148 @@
 # configure the libz converter
 echo ""
-echo "Configuring libz"
+echo "Configuring libz (AKA zlib)"
 echo ""
 
 cd "$PACKAGES/libz"
+echo "Supressing LDFLAGS global setting as values"
+echo "(rk2 setting this to 'LDFLAGS=-static' is not liked by libz"
+store_LDFLAGS="$LDFLAGS"
+export LDFLAGS=
+
 gzip -dc zlib-1.2.11.tar.gz | tar -xf -
 cd zlib-1.2.11 && \
@@ -178 +183 @@
   exit 1
 fi
+
+echo "Restoring LDFLAGS=$store_LDFLAGS"
+export LDFLAGS="$store_LDFLAGS"
 
 # The way common-src compiles up expat during the configure stage itself,