Changeset 30467


Ignore:
Timestamp:
04/08/16 17:28:09 (5 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.

Location:
gs2-extensions/gnome-lib/trunk/src/packages
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE.sh

    r28326 r30467  
    44
    55# The standard list of packages
    6 pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT PKG-CONFIG LIBXML LIBFFI GLIB LIBGSF"
     6# For Mac Yosemite we found that PKG-CONFIG is dependent on GLIB, so we've moved GLIB ahead of PKG-CONFIG in the list
     7pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT GLIB PKG-CONFIG LIBXML LIBFFI LIBGSF"
    78
    89# libiconv was found to be necessary on the latest DL mac (2013)
     
    1011# glib getting a conflict during its configure stage over the version of iconv
    1112
    12 # 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.
     13# 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.
    1314osversion=`uname -r | sed 's/\..*$//'`;
    1415if [ "x$GSDLOS" = "xdarwin" -a $osversion -ge 11 ] ; then
    15     pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL CUPS LIBICONV GETTEXT PKG-CONFIG LIBXML LIBFFI GLIB LIBGSF"   
     16    pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL CUPS LIBICONV GETTEXT GLIB PKG-CONFIG LIBXML LIBFFI LIBGSF"   
    1617fi
    1718
    1819if [ "x$crossOS" != "x" ] ; then
    1920  # cross compiling
    20   windows_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT LIBXML GLIB LIBGSF"
     21  windows_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT GLIB LIBXML LIBGSF"
    2122
    22   android_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT LIBXML DBUS LIBFFI GLIB LIBGSF"
     23  android_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT GLIB LIBXML DBUS LIBFFI LIBGSF"
    2324
    2425
  • gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/PKG-CONFIG.sh

    r23096 r30467  
    22
    33package=pkg-config
    4 version=-0.25
     4#version=-0.25
     5version=-0.29
    56
    67progname=$0
     
    910
    1011prefix=$GEXTGNOME_INSTALLED
     12
     13export GLIB_CFLAGS="-I$GEXTGNOME_INSTALLED/include/glib-2.0 -I$GEXTGNOME_INSTALLED/lib/glib-2.0/include"
     14export GLIB_LIBS="-L$GEXTGNOME_INSTALLED/lib -lglib-2.0"
    1115
    1216opt_run_untar $force_untar $auto_untar $package $version
  • gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/READLINE.sh

    r23622 r30467  
    22
    33package=readline
    4 version=-6.1
     4#version=-6.1
     5version=-6.3
    56
    67progname=$0
Note: See TracChangeset for help on using the changeset viewer.