Changeset 30862 for gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE.sh

Timestamp:

2016-10-14T18:24:13+13:00 (8 years ago)

Author:

ak19

Message:

Changes to get libiconv issues on MacOS El Capitan straightened out, since DYLD_LIBRARY_PATH gets wiped out on these newer Mac OS versions. The current solution is to use the system libiconv on MacOS machines that are already specific to Macs (and therefore compatible with Macs).

File:

• gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE.sh (modified) (1 diff)

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE.sh

@@ -12 +12 @@
 
 # Mac 11/12 (Lion/Mountain Lion and possibly later versions) need CUPS. Mac 9/10 (Leopard, Snow Leopard) don't need it and gnome-lib fails to compile with it.
+# 14 Oct 2016: Mac 15 (El Capitan and possibly later versions) changed matters again: DYLD_LIBRARY_PATH gets wiped out, leading to libiconv problems
+# The solution was that, since MacOS come with their own special compatible libconv (see https://discussions.apple.com/thread/1931034?start=0&tstart=0),
+# to let MacOS machines use the system libiconv rather than compiling up the one in gnome-lib or the other one used by indexers' jni and mgpp/text, etc.
+# Since CUPS was only included to get libiconv to work, neither are now compiled up with gnome-lib:   
 osversion=`uname -r | sed 's/\..*$//'`;
 if [ "x$GSDLOS" = "xdarwin" -a $osversion -ge 11 ] ; then
-    pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL CUPS LIBICONV GETTEXT GLIB PKG-CONFIG LIBXML LIBFFI LIBGSF"    
+#    pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL CUPS LIBICONV GETTEXT GLIB PKG-CONFIG LIBXML LIBFFI LIBGSF"    
+    pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT GLIB PKG-CONFIG LIBXML LIBFFI LIBGSF"    
 fi