Changeset 34983 for gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE/GLIB.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/GLIB.sh (modified) (3 diffs)

gs2-extensions/gnome-lib/trunk/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
+# More recently compiling on Mojave (MacOS) newer compilation errors were encountered, 
+# prompting a signficant bump up in version number
+# Back to using gs- prefix as this newer glib needed customisations for linux 64 bit LSB env,
+# see packages/README.txt for details
+
 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
@@ -17 +24 @@
 export CXXFLAGS="$CXXFLAGS -I$GEXTGNOME_INSTALLED/include"
 export LDFLAGS="$LDFLAGS -L$GEXTGNOME_INSTALLED/lib"
+
+export LIBFFI_CFLAGS="-I$GEXTGNOME_INSTALLED/lib/libffi-3.0.11/include"
+export LIBFFI_LIBS="-L$GEXTGNOME_INSTALLED/lib -lffi"
+
+export PCRE_CFLAGS="-I$GEXTGNOME_INSTALLED/include"
+export PCRE_LIBS="-L$GEXTGNOME_INSTALLED/lib -lpcre"
 
 if [ "x$crossOS" = "xandroid" ] ; then
@@ -37 +50 @@
 fi
 
+# Disabling libmount, as it breaks compilation:
+# - http://unix.stackexchange.com/questions/327019/ddg#398242
+#   "Unless you actually need libmount for something it's much easier
+#   to simply disable it by passing --enable-libmount=no to configure"
+# - http://linuxfromscratch.org/lfs/view/systemd/chapter08/util-linux.html
+#   "Purpose of libmount: Contains routines for block device mounting and unmounting"
 opt_run_untar $force_untar $auto_untar $package $version
 opt_run_configure $force_config $auto_config $package $version $prefix \
-  --disable-shared --enable-static --disable-dtrace --disable-systemtap $extra_config_args
+          --disable-shared --enable-static --disable-dtrace --disable-systemtap \
+          --enable-libmount=no $extra_config_args
 
 # In the above ...