Changeset 34350

Timestamp:

2020-09-11T15:42:48+12:00 (4 years 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:

• GLIB.sh (modified) (1 diff)
• LIBGSF.sh (modified) (1 diff)
• PCRE.sh (added)
• PKG-CONFIG.sh (modified) (1 diff)

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

@@ -2 +2 @@
 
 # glib2.28.1 was modified for Greenstone to allow compilation to succed on a Mac, so it has acquired a 'gs-' prefix
-package=gs-glib
+# More recently compiling on Macrocarpa (MacOS) newer compilation errors were encountered, 
+# prompting a signficant bump up in version number
+
+#package=gs-glib
+package=glib
 #version=-2.24.2
-version=-2.28.1
-#version=-2.34.3
+#version=-2.28.1
+##version=-2.34.3
+version=-2.54.3
 
 progname=$0

gs2-extensions/gnome-lib/branches/macos-dev/src/packages/CASCADE-MAKE/LIBGSF.sh

@@ -17 +17 @@
 export LDFLAGS="$LDFLAGS -L$GEXTGNOME_INSTALLED/lib"
 
+osversion=`uname -r | sed 's/\..*$//'`;
+if [ "x$GSDLOS" = "xdarwin" -a $osversion -ge 11 ] ; then
+    export CFLAGS="$CFLAGS -framework Carbon -framework CoreFoundation -framework Security"
+    if [ -d /usr/local/lib/pkgconfig ] ; then
+    export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
+    fi
+fi
+
+
 opt_run_untar $force_untar $auto_untar $package $version
 

gs2-extensions/gnome-lib/branches/macos-dev/src/packages/CASCADE-MAKE/PKG-CONFIG.sh

@@ -14 +14 @@
 export GLIB_LIBS="-L$GEXTGNOME_INSTALLED/lib -lglib-2.0" 
 
+osversion=`uname -r | sed 's/\..*$//'`;
+if [ "x$GSDLOS" = "xdarwin" -a $osversion -ge 11 ] ; then
+    export CFLAGS="$CFLAGS -framework Carbon -framework CoreFoundation -framework Security"
+fi
+
 opt_run_untar $force_untar $auto_untar $package $version
 opt_run_configure $force_config $auto_config $package $version $prefix --disable-shared --enable-static