Changeset 32352 for main/trunk

Timestamp:

2018-08-21T20:10:01+12:00 (6 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:

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

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

@@ -163 +163 @@
 # BEWARE: The defaults for --prefix and meaning of --openssldir differ between
 # versions of openssl. In the earlier version (1.0.* like 1.0.2l), if
-# --prefix is not supplied then the generated lib, include and bin folders
+# --prefix is not supplied, then the generated lib, include and bin folders
 # will also go into --openssldir.
 # In the newer version 1.1.* 1.1.0f, if --prefix is not supplied, it will
 # try to install the generated lib, include and bin folders into a system place.
-# So better to provide both --opennssldir and --prefix, for both openssl versions
+# So better to provide both --openssldir and --prefix, for both openssl versions
 # to compile succesfully.
 # If you ever want to have the .a libraries that building openssl generates,
@@ -199 +199 @@
 export CXX=$stored_CXX
 
+# GS3 needs the now-built openssl to set up https. So we copy (hardlink?) the necessary openssl stuff
+# Copying is perhaps OK: <12Mb without the manual or 14.4Mb with manuals.
+# to GSDL3SRCHOME/bin/$GSDLOS. Not sure if GSDL3SRCHOME is even set during configure
+# if this is a GS3 installation. But we have $GSDLHOME.
+gs3_bin_osdir=../../../bin/$GSDLOS
+if [[ -f ../../../gs3-server.sh ]] && [[ -d $gs3_bin_osdir ]] ; then
+    # get rid of any openssl copy from a previous installation
+    if [ -d $gs3_bin_osdir/openssl ] ; then
+    rm -rf $gs3_bin_osdir/openssl
+    fi
+    mkdir $gs3_bin_osdir/openssl
+    cp -r $PACKAGES/openssl/bin $PACKAGES/openssl/certs $PACKAGES/openssl/include $PACKAGES/openssl/lib $PACKAGES/openssl/misc $PACKAGES/openssl/private $gs3_bin_osdir/openssl/.
+fi
+
 # now move the include, lib and bin folders to the correct place