Changeset 34350

Show
Ignore:
Timestamp:
11.09.2020 15:42:48 (3 weeks ago)
Author:
davidb
Message:

Changes to allow gnome-lib extension to compile on Macrocarpa (MacOS)

Location:
gs2-extensions/gnome-lib/branches/macos-dev/src/packages/CASCADE-MAKE
Files:
1 added
3 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/gnome-lib/branches/macos-dev/src/packages/CASCADE-MAKE/GLIB.sh

    r32887 r34350  
    22 
    33# glib2.28.1 was modified for Greenstone to allow compilation to succed on a Mac, so it has acquired a 'gs-' prefix 
    4 package=gs-glib 
     4# More recently compiling on Macrocarpa (MacOS) newer compilation errors were encountered,  
     5# prompting a signficant bump up in version number 
     6 
     7#package=gs-glib 
     8package=glib 
    59#version=-2.24.2 
    6 version=-2.28.1 
    7 #version=-2.34.3 
     10#version=-2.28.1 
     11##version=-2.34.3 
     12version=-2.54.3 
    813 
    914progname=$0 
  • gs2-extensions/gnome-lib/branches/macos-dev/src/packages/CASCADE-MAKE/LIBGSF.sh

    r30881 r34350  
    1717export LDFLAGS="$LDFLAGS -L$GEXTGNOME_INSTALLED/lib" 
    1818 
     19osversion=`uname -r | sed 's/\..*$//'`; 
     20if [ "x$GSDLOS" = "xdarwin" -a $osversion -ge 11 ] ; then 
     21    export CFLAGS="$CFLAGS -framework Carbon -framework CoreFoundation -framework Security" 
     22    if [ -d /usr/local/lib/pkgconfig ] ; then 
     23    export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig 
     24    fi 
     25fi 
     26 
     27 
    1928opt_run_untar $force_untar $auto_untar $package $version 
    2029 
  • gs2-extensions/gnome-lib/branches/macos-dev/src/packages/CASCADE-MAKE/PKG-CONFIG.sh

    r30881 r34350  
    1414export GLIB_LIBS="-L$GEXTGNOME_INSTALLED/lib -lglib-2.0"  
    1515 
     16osversion=`uname -r | sed 's/\..*$//'`; 
     17if [ "x$GSDLOS" = "xdarwin" -a $osversion -ge 11 ] ; then 
     18    export CFLAGS="$CFLAGS -framework Carbon -framework CoreFoundation -framework Security" 
     19fi 
     20 
    1621opt_run_untar $force_untar $auto_untar $package $version 
    1722opt_run_configure $force_config $auto_config $package $version $prefix --disable-shared --enable-static