Changeset 35197

Timestamp:

2021-06-06T21:33:39+12:00 (3 years ago)

Author:

davidb

Message:

Changes after compiling on newly updated MacOs (Macrocarpa)

Location:

gs3-extensions/mars-src/trunk/devel

Files:

• CASCADE-MAKE.sh (modified) (1 diff)
• CASCADE-MAKE/NASM.sh (added)
• CASCADE-MAKE/OPENSSL.sh (modified) (2 diffs)
• nasm-2.15.05.tar.gz (added)

gs3-extensions/mars-src/trunk/devel/CASCADE-MAKE.sh

@@ -7 +7 @@
 fi
 
-for d in ZLIB OPENSSL CMAKE NODEJS ; do
+for d in ZLIB OPENSSL CMAKE NODEJS NASM ; do
     echo "    Running CASCADE-MAKE/$d.sh"
 

gs3-extensions/mars-src/trunk/devel/CASCADE-MAKE/OPENSSL.sh

@@ -18 +18 @@
 opt_run_untar $force_untar $auto_untar $package $version
 
+# 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
+
+
 #opt_run_configure $force_config $auto_config $package $version $prefix
-if [ $force_config = "1" ] ; then
+
+if [[ "x$GSDLOS" == "xdarwin" ]] && [[ `uname -m` == *"64" ]] ; then
+  if [ $force_config = "1" ] ; then
+    PACKAGES="$PWD/$package$version"
+    echo "[pushd $package$version]"
+    ( cd $package$version ; \
+      echo $CROSSCONFIGURE_VARS ./Configure --openssldir=$PACKAGES/openssl no-shared $CROSSCONFIGURE_ARGS $@ darwin64-x86_64-cc ; \
+      eval $CROSSCONFIGURE_VARS ./Configure --openssldir=$PACKAGES/openssl no-shared $CROSSCONFIGURE_ARGS $@ darwin64-x86_64-cc )
+    if [ $? != 0 ] ; then
+        echo "      Error encountered running *configure* stage of $progname"
+        exit 1
+    fi
+    echo "[popd]"
+  else
+    if [ $auto_config = "1" ] ; then
+      echo "Found top-level for ${progname%.*} => no need to run ./configure"
+    fi
+  fi
+
+else
+  if [ $force_config = "1" ] ; then
     echo "[pushd $package$version]"
     ( cd $package$version ; \
@@ -33 +60 @@
       echo "Found top-level for ${progname%.*} => no need to run ./configure"
     fi
+  fi
 fi