Changeset 31145 for gs2-extensions/imagemagick/trunk/src

Timestamp:

2016-11-23T17:21:51+13:00 (7 years ago)

Author:

ak19

Message:

Redoing El Capitan imgmagick binary for release after testing on an uncooperative El Cap Mac machine. The key change involved recompiling with mmacosx-version-min=10.8 (Mountain Lion) to make the binary more backwards compatible. Works on uncooperative mac. Still to test on Dr Bainbridge's El Cap laptop.

Location:

gs2-extensions/imagemagick/trunk/src

Files:

• devel.bash (modified) (1 diff)
• packages/CASCADE-MAKE/IMAGEMAGICK.sh (modified) (1 diff)

gs2-extensions/imagemagick/trunk/src/devel.bash

@@ -8 +8 @@
   source setup.bash
 fi
+
+# for darwin, want to be backwards compatible upto and incl Mountain Lion
+# to avoid "Illegal Instruction 4" errors when running imgmagick convert
+# on older Mac
+if [ "x$GSDLOS" = "xdarwin" ] ; then
+    export CFLAGS="-mmacosx-version-min=10.8 $CFLAGS"
+    export CXXFLAGS="-mmacosx-version-min=10.8 $CXXFLAGS"
+    export LDFLAGS="-mmacosx-version-min=10.8 $LDFLAGS"
+fi

gs2-extensions/imagemagick/trunk/src/packages/CASCADE-MAKE/IMAGEMAGICK.sh

@@ -13 +13 @@
 export CPPFLAGS="$CPPFLAGS -I$GEXTIMAGEMAGICK_INSTALLED/include"
 export CXXFLAGS="$CXXFLAGS -I$GEXTIMAGEMAGICK_INSTALLED/include"
-export LDFLAGS="$LDFLAGS -L$GEXTIMAGEMAGICK_INSTALLED/lib"
+# We need to add libz to LDFLAGS to get the configure test for libtiff to succeed
+# (only found to be necessary on an uncooperative mac)
+export LDFLAGS="$LDFLAGS -L$GEXTIMAGEMAGICK_INSTALLED/lib -lz"
 export LD_LIBRARY_PATH="$GEXTIMAGEMAGICK_INSTALLED/lib"