Ignore:
Timestamp:
08/21/18 20:10:01 (2 years ago)
Author:
ak19
Message:

Including the necessary folders of the openssl that we compiled up in GS3/bin/linux. Untested, but hopefully checking the nightly binary tomorrow will confirm this worked. Still need to get a matching openssl binary for Windows.

File:
1 edited

Legend:

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

    r31840 r32352  
    163163# BEWARE: The defaults for --prefix and meaning of --openssldir differ between
    164164# versions of openssl. In the earlier version (1.0.* like 1.0.2l), if
    165 # --prefix is not supplied then the generated lib, include and bin folders
     165# --prefix is not supplied, then the generated lib, include and bin folders
    166166# will also go into --openssldir.
    167167# In the newer version 1.1.* 1.1.0f, if --prefix is not supplied, it will
    168168# try to install the generated lib, include and bin folders into a system place.
    169 # So better to provide both --opennssldir and --prefix, for both openssl versions
     169# So better to provide both --openssldir and --prefix, for both openssl versions
    170170# to compile succesfully.
    171171# If you ever want to have the .a libraries that building openssl generates,
     
    199199export CXX=$stored_CXX
    200200
     201# GS3 needs the now-built openssl to set up https. So we copy (hardlink?) the necessary openssl stuff
     202# Copying is perhaps OK: <12Mb without the manual or 14.4Mb with manuals.
     203# to GSDL3SRCHOME/bin/$GSDLOS. Not sure if GSDL3SRCHOME is even set during configure
     204# if this is a GS3 installation. But we have $GSDLHOME.
     205gs3_bin_osdir=../../../bin/$GSDLOS
     206if [[ -f ../../../gs3-server.sh ]] && [[ -d $gs3_bin_osdir ]] ; then
     207    # get rid of any openssl copy from a previous installation
     208    if [ -d $gs3_bin_osdir/openssl ] ; then
     209    rm -rf $gs3_bin_osdir/openssl
     210    fi
     211    mkdir $gs3_bin_osdir/openssl
     212    cp -r $PACKAGES/openssl/bin $PACKAGES/openssl/certs $PACKAGES/openssl/include $PACKAGES/openssl/lib $PACKAGES/openssl/misc $PACKAGES/openssl/private $gs3_bin_osdir/openssl/.
     213fi
     214
    201215# now move the include, lib and bin folders to the correct place
    202216
Note: See TracChangeset for help on using the changeset viewer.