Changeset 36311


Ignore:
Timestamp:
2022-07-26T11:18:25+12:00 (3 weeks 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:
1 edited

Legend:

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

    r35377 r36311  
    179179stored_CC=$CC
    180180stored_CXX=$CXX
     181ssl_status=
    181182if [[ "x$GSDLOS" == "xdarwin" ]] && [[ `uname -m` == *"64" ]] ; then
    182183    export CC="gcc"
     
    185186    #CC="gcc" CXX="g++" ./Configure --openssldir=$PACKAGES/openssl no-shared darwin64-x86_64-cc
    186187    ./Configure --openssldir=$PACKAGES/openssl no-shared darwin64-x86_64-cc
     188    ssl_status=$?
     189elif [[ "x$RK32" != "x" ]] ; then
     190    echo "in RK32 mode"
     191    echo ./Configure --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl  no-shared linux-generic32
     192    # we found that the following needs bash to run as running it directly here (from within ant)
     193    # as ./Configure had an error, even though the command worked fine on the command line
     194    bash ./Configure --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl  no-shared linux-generic32
     195    ssl_status=$?
     196
    187197else
    188     echo ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared
     198    # this will auto guess the system you are running on
     199     echo ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared
    189200    ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared
     201fi
     202if [[ $ssl_status != 0 ]] ; then
     203    echo "ERROR: something went wrong with configuring openssl"
     204    exit $ssl_status
    190205fi
    191206# make
Note: See TracChangeset for help on using the changeset viewer.