Changeset 36311 for main/trunk

Timestamp:

2022-07-26T11:18:25+12:00 (21 months ago)

Author:

kjdon

Message:

compiling for 32 bit linux on new gs build system which is 64 bit - running config for openssl gives the wrong value for what machine you are on - we are on 64 bit, but don't want to be compiling for 64 bit. Will prob change the environment variable name, just temporarily putting it here so I can re-run the release kit

File:

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

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

@@ -179 +179 @@
 stored_CC=$CC
 stored_CXX=$CXX
+ssl_status=
 if [[ "x$GSDLOS" == "xdarwin" ]] && [[ `uname -m` == *"64" ]] ; then
     export CC="gcc"
@@ -185 +186 @@
     #CC="gcc" CXX="g++" ./Configure --openssldir=$PACKAGES/openssl no-shared darwin64-x86_64-cc
     ./Configure --openssldir=$PACKAGES/openssl no-shared darwin64-x86_64-cc
+    ssl_status=$?
+elif [[ "x$RK32" != "x" ]] ; then
+    echo "in RK32 mode"
+    echo ./Configure --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl  no-shared linux-generic32
+    # we found that the following needs bash to run as running it directly here (from within ant)
+    # as ./Configure had an error, even though the command worked fine on the command line
+    bash ./Configure --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl  no-shared linux-generic32
+    ssl_status=$?
+
 else
-    echo ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared
+    # this will auto guess the system you are running on
+     echo ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared
     ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared
+fi
+if [[ $ssl_status != 0 ]] ; then
+    echo "ERROR: something went wrong with configuring openssl" 
+    exit $ssl_status
 fi
 # make