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

Timestamp:

2017-07-27T18:40:26+12:00 (7 years ago)

Author:

ak19

Message:

We now compile up OpenSSL, since wget needs SSL support to download https pages. wget is now compiled up OpenSSL, achieved by changes during wget's configure phase. OpenSSL is configured and compiled up during GS' configure phase. Details are in the updated README at wget level.

File:

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

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

@@ -139 +139 @@
 
 
+
+# The way common-src compiles up expat during the configure stage itself,
+# configure openssl (needs to be done before wget)
+# and compile openssl during the configure stage itself.
+# Needed by wget for https support
+
+echo ""
+echo "Configuring openssl"
+echo ""
+cd "$PACKAGES/openssl"
+openssl_pkgname=openssl-1.0.2l
+if test ! -d $openssl_pkgname ;
+then
+  gzip -dc $openssl_pkgname.tar.gz | tar -xf -
+fi
+cd openssl-1.0.2l
+
+# configure
+# see the INSTALL file for OpenSSL to see config options for openssl
+# --prefix indicates where the generated lib, include and bin folders will go
+# --openssldir will contain the manuals and other non-essentials
+# we'll put them into $bindir/openssl for wget to use
+echo ./config --prefix=$bindir/openssl --openssldir=$PACKAGES/openssl no-shared
+./config --prefix=$bindir/openssl --openssldir=$PACKAGES/openssl no-shared
+# make
+echo make
+make
+# make install
+echo make install
+make install
+
+# now move the include, lib and bin folders to the correct place
+
 # configure the wvWare Word document converter
 echo ""
@@ -227 +260 @@
 fi
 
+#./configure $CACHE_FILE --prefix=$PACKAGES/wget --without-ssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs
+
+# We weren't compiling up wget statically before either
+# However, to compile up wget (statically or not) with openssl, see
+# https://stackoverflow.com/questions/9817337/compiling-wget-with-static-linking-self-compiled-openssl-library-linking-issu
+# Note: if the cppflags and ldflags are set during the configure stage, as we now do,
+# then the make command needn't additionally set them as well. So just make, make install then works 
+echo cd "$PACKAGES/wget/wget-1.15-gs"
+echo CPPFLAGS="-I/$bindir/openssl/include" LDFLAGS="-L/$bindir/openssl/lib" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs
 cd "$PACKAGES/wget/wget-1.15-gs" && \
-#./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs
-./configure $CACHE_FILE --prefix=$PACKAGES/wget --without-ssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs
+CPPFLAGS="-I/$bindir/openssl/include" LDFLAGS="-L/$bindir/openssl/lib" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs
+
+
+##
+##CPPFLAGS="-I/Scratch/ak19/gs3-svn-13July2017/gs2build/bin/linux/openssl/include" LDFLAGS="-L/Scratch/ak19/gs3-svn-13July2017/gs2build/bin/linux/openssl/lib" ./configure --prefix=/Scratch/ak19/gs3-svn-13July2017/gs2build/build-src/packages/wget --with-ssl=openssl --bindir="/Scratch/ak19/gs3-svn-13July2017/gs2build/bin/linux" -disable-nls
+##
+##make CPPFLAGS="-I/Scratch/ak19/gs3-svn-13July2017/gs2build/bin/linux/openssl/include" LDFLAGS="-L/Scratch/ak19/gs3-svn-13July2017/gs2build/bin/linux/openssl/lib -static"
 
 if test x$? = x1 ;