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

Timestamp:

2016-04-08T17:28:09+12:00 (8 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed gnome-lib compilation on Yosemite by updating pkg-config (0.25 to 0.29) and readline (from 6.1 to 6.3), and by promoting the compilation of glib to before the updated pkg-config to get the two to compile with respect to each other.

File:

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

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

@@ -4 +4 @@
 
 # The standard list of packages
-pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT PKG-CONFIG LIBXML LIBFFI GLIB LIBGSF"
+# For Mac Yosemite we found that PKG-CONFIG is dependent on GLIB, so we've moved GLIB ahead of PKG-CONFIG in the list
+pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT GLIB PKG-CONFIG LIBXML LIBFFI LIBGSF"
 
 # libiconv was found to be necessary on the latest DL mac (2013)
@@ -10 +11 @@
 # glib getting a conflict during its configure stage over the version of iconv
 
-# Mac 11/12 (Lion/Mountain Lion) need CUPS. Mac 9/10 (Leopard, Snow Leopard) don't need it and gnome-lib fails to compile with it.
+# 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.
 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 PKG-CONFIG LIBXML LIBFFI GLIB LIBGSF"    
+    pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL CUPS LIBICONV GETTEXT GLIB PKG-CONFIG LIBXML LIBFFI LIBGSF"    
 fi
 
 if [ "x$crossOS" != "x" ] ; then
   # cross compiling
-  windows_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT LIBXML GLIB LIBGSF"
+  windows_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT GLIB LIBXML LIBGSF"
 
-  android_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT LIBXML DBUS LIBFFI GLIB LIBGSF"
+  android_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT GLIB LIBXML DBUS LIBFFI LIBGSF"