Changeset 36341 for main/trunk/greenstone2/build-src/packages/configure

Timestamp:

2022-07-29T11:35:00+12:00 (21 months ago)

Author:

kjdon

Message:

a bit of tidying and better reporting. also make it use bash, as don't work for sh

File:

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

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

@@ -1 @@
-#! /bin/sh
+#! /bin/bash
 
 PACKAGES=`pwd`
@@ -181 +181 @@
 ssl_status=-1
 if [[ "x$GSDLOS" == "xdarwin" ]] && [[ `uname -m` == *"64" ]] ; then
+    echo Darwin 64, using darwin64-x86_64-cc for OPENSSL_HOST
     export CC="gcc"
     export CXX="g++"
@@ -187 +188 @@
     ./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
+    
+elif [[ "x$OPENSSL_HOST" != "x" ]] ; then
+    echo "have found environment variable OPENSSL_HOST - using that with Configure, instead of running config which will guess the host"
+    echo ./Configure --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl  no-shared $OPENSSL_HOST
     # 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
+    ./Configure --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl  no-shared $OPENSSL_HOST
     ssl_status=$?
 
@@ -198 +200 @@
     # 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
+     ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared
     ssl_status=$?
 fi
-if [[ $ssl_status != 0 ]] ; then
-    echo "ERROR: something went wrong with configuring openssl" 
+
+if [ $ssl_status != 0 ] ; then
+    echo "ERROR: something went wrong with configuring openssl, returning $ssl_status" 
     exit $ssl_status
 fi
+
 # make
-echo make
+echo Making OpenSSL
+
 make
 # make 'install_sw' is a target this package has for installing just the software,