Changeset 31835

Timestamp:

2017-08-01T19:29:36+12:00 (7 years ago)

Author:

ak19

Message:

Dr Bainbridge got openssl 1.0.2 compiling successfully on Mac 64 bit, after which wget compiled successfully against our openSSL.

File:

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

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

@@ -173 +173 @@
 # into $bindir/openssl for wget to use, since wget is built against openssl's
 # static libraries and therefore wget doesn't need these when running.
-echo ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared
-./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared
+
+# for 64 bit Macs, need to run ./Configure with darwin64-x86_64-cc, rather than ./config
+# To overcome an error in openssl's perl script determining the LLVM version, we also need force the
+# compilers to be GNU since Clang comes back with an LLVM version that doesn't work out
+stored_CC=$CC
+stored_CXX=$CXX
+if [[ "x$GSDLOS" == "xdarwin" ]] && [[ `uname -m` == *"64" ]] ; then
+    export CC="gcc"
+    export CXX="g++"
+    echo ./Configure --openssldir=$PACKAGES/openssl no-shared darwin64-x86_64-cc
+    #CC="gcc" CXX="g++" ./Configure --openssldir=$PACKAGES/openssl no-shared darwin64-x86_64-cc
+    ./Configure --openssldir=$PACKAGES/openssl no-shared darwin64-x86_64-cc
+else
+    echo ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared
+    ./config --prefix=$PACKAGES/openssl --openssldir=$PACKAGES/openssl no-shared
+fi
 # make
 echo make
@@ -181 +195 @@
 echo make install
 make install
+# restore the compile flags
+export CC=$stored_CC
+export CXX=$stored_CXX
 
 # now move the include, lib and bin folders to the correct place
@@ -259 +276 @@
 fi
 
+# On darwin, the wget binary that we build (in $GSDLHOME/bin/$GSDLOS/wget) 
+# finds a system libiconv, as you'll notice when you run "otool -L wget"
+# That's because we expressly don't compile up libiconv on Macs anymore,
+# as the Mac system will have the right libiconv installed.
+
 # configure wget
 wget_pkgname=wget-1.15-gs
@@ -278 +300 @@
 
 # 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
+# However, to compile up wget (statically or not) with openssl, as we do now to support retrieving from https urls, see
 # https://stackoverflow.com/questions/9817337/compiling-wget-with-static-linking-self-compiled-openssl-library-linking-issu
 # Note: contrary to the instructions at the link, if the cppflags and ldflags are set during the
@@ -289 +311 @@
 
 # for wget-1.15-gs. (can also try adding --localstatedir="$bindir/wget" --enable-iri)
-echo CPPFLAGS="-I$PACKAGES/openssl/include" LDFLAGS="-L$PACKAGES/openssl/lib" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraarg
+echo CPPFLAGS="-I$PACKAGES/openssl/include $CPPFLAGS" LDFLAGS="-L$PACKAGES/openssl/lib $LDFLAGS" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraarg
 cd "$PACKAGES/wget/$wget_pkgname" && \
-CPPFLAGS="-I$PACKAGES/openssl/include" LDFLAGS="-L$PACKAGES/openssl/lib" ./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS $wget_extraargs
+CPPFLAGS="-I$PACKAGES/openssl/include $CPPFLAGS" LDFLAGS="-L$PACKAGES/openssl/lib $LDFLAGS" ./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)