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

Timestamp:

2021-04-01T11:55:33+13:00 (3 years ago)

Author:

anupama

Message:

Merging the gnome-lib branch macos-dev at ​https://trac.greenstone.org/browser/gs2-extensions/gnome-lib/branches/macos-dev with the main trunk after testing it first on assigned linux 64 bit machine in lab as well as 64 bit LSB VM, and making changes for it to compile on Linux 64 bit LSB.

File:

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

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

@@ -12 +12 @@
 export CFLAGS="$CFLAGS -DLIBXML_STATIC"
 
-export CFLAGS="$CFLAGS -I$GEXTGNOME_INSTALLED/include"
+export CFLAGS="-Dg_memmove=memmove $CFLAGS -I$GEXTGNOME_INSTALLED/include"
 export CPPFLAGS="$CPPFLAGS -I$GEXTGNOME_INSTALLED/include"
 export CXXFLAGS="$CXXFLAGS -I$GEXTGNOME_INSTALLED/include"
 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