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

Timestamp:

2017-07-28T18:53:37+12:00 (7 years ago)

Author:

ak19

Message:

Intermediate commit for building wget with openssl. This is a working version, part of incremental commits. For now, we're still using wget-1.15-gs (that always requires --no-check-certificate if running wget), which now uses a wgetrc conf file to turn off the check-certificate default of wget, since without this, wget fails getting https pages that don't yet have a valid security certificate. This commit introduces the template wgetrc-gs.in file, which contains a flag set to not require certificate checks, is copied to gs2build/OS as wgetrc. The WGETRC env var is set in setup.bash to point to the wgetrc file so wget runs smoothly against https urls.

File:

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

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

@@ -150 +150 @@
 cd "$PACKAGES/openssl"
 openssl_pkgname=openssl-1.0.2l
+#openssl_pkgname=openssl-1.1.0f
 if test ! -d $openssl_pkgname ;
 then
@@ -158 +159 @@
 # configure
 # see the INSTALL file for OpenSSL to see config options for openssl
+# If you ever want to have the .a libraries that building openssl generates,
+# then use the --prefix and point it to the $bindir.
 # --prefix indicates where the generated lib, include and bin folders will go
 # --openssldir will contain the manuals and other non-essentials
@@ -248 +251 @@
 
 # configure wget
+wget_pkgname=wget-1.15-gs
+#wget_pkgname=wget-1.17.1-gs
 echo ""
 echo "Configuring wget"
 echo ""
 cd "$PACKAGES/wget"
-gzip -dc wget-1.15-gs.tar.gz | tar -xf -
+gzip -dc $wget_pkgname.tar.gz | tar -xf -
 if test x$crossOS = "xandroid" ;
 then
@@ -260 +265 @@
 fi
 
+# When compiling wget-1.15-gs without openssl as before:
 #./configure $CACHE_FILE --prefix=$PACKAGES/wget --without-ssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs
 
-# We weren't compiling up wget statically before either
+# We weren't compiling up wget statically before either and we still aren't
 # 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" && \
+# Note: contrary to the instructions at the link, 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 works thereafter
+
+echo copying "$PACKAGES/wget/wgetrc-gs.in" file to "$bindir/wgetrc"
+cp "$PACKAGES/wget/wgetrc-gs.in" "$bindir/wgetrc"
+echo cd "$PACKAGES/wget/$wget_pkgname"
+
+# for wget-1.15-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri)
+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_extraarg
+cd "$PACKAGES/wget/$wget_pkgname" && \
 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
 
+# for wget-1.17.1-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri)
+#echo OPENSSL_CFLAGS="-I/$bindir/openssl/include" OPENSSL_LIBS="-L/$bindir/openssl/lib -lssl -lcrypto" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --with-openssl=auto --with-libssl-prefix="$bindir/openssl" --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs
+#cd "$PACKAGES/wget/$wget_pkgname" && \
+#OPENSSL_CFLAGS="-I/$bindir/openssl/include" OPENSSL_LIBS="-L/$bindir/openssl/lib -lssl -lcrypto" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --with-openssl=auto --with-libssl-prefix="$bindir/openssl" --bindir="$bindir"  -disable-nls $HOSTTARGETFLAGS $wget_extraargs
 
 ##