Changeset 34983

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.

Location:

gs2-extensions/gnome-lib/trunk/src

Files:

• README (modified) (2 diffs)
• packages/CASCADE-MAKE.sh (modified) (3 diffs)
• packages/CASCADE-MAKE/GLIB.sh (modified) (3 diffs)
• packages/CASCADE-MAKE/LIBGSF.sh (modified) (1 diff)
• packages/CASCADE-MAKE/LIBZ.sh (modified) (2 diffs)
• packages/CASCADE-MAKE/PCRE.sh (added)
• packages/CASCADE-MAKE/PKG-CONFIG.sh (modified) (1 diff)
• packages/README.txt (modified) (1 diff)
• packages/gs-glib-2.54.3.tar.gz (added)
• packages/pcre-8.44.tar.gz (added)
• packages/zlib-1.2.11.tar.gz (added)

gs2-extensions/gnome-lib/trunk/src/README

@@ -1 @@
-A. To configure and compile wvware in Greenstone2/3, it used to be required to first:
+A. For compiling glib-2.54.3 onwards, need python2.7+. On LSB, python needs to be manually compiled up (we're using 2.7.18 on 64 bit LSB) and put into a user location e.g. /home/sjm84/python2.7/bin in our case, with its bin folder added to the PATH: 
+(  export PATH=/home/sjm84/python2.7/bin:$PATH   )
+
+To configure and compile wvware in Greenstone2/3, it used to be required to first:
    source ./devel.bash
 
@@ -12 +15 @@
    cd gnome-lib
 
+For compiling glib-2.54.3 onwards, need python2.7+. On LSB this needs to be manually compiled up and put into a user location and its bin folder on the PATH, e.g. /home/sjm84/python2.7/bin
+
 Then:
-
+(  export PATH=/home/sjm84/python2.7/bin:$PATH   )
    export CFLAGS="-fPIC $CFLAGS"
    export CXXFLAGS="-fPIC $CXXFLAGS"

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

@@ -5 +5 @@
 # The standard list of packages
 # For Mac Yosemite we found that PKG-CONFIG is dependent on GLIB, so we've moved GLIB ahead of PKG-CONFIG in the list
-pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT GLIB PKG-CONFIG LIBXML LIBXSLT LIBFFI LIBGSF"
+pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT LIBFFI PCRE GLIB PKG-CONFIG LIBXML LIBXSLT LIBGSF"
 
 # libiconv was found to be necessary on the latest DL mac (2013)
@@ -19 +19 @@
 if [ "x$GSDLOS" = "xdarwin" -a $osversion -ge 11 ] ; then
 #    pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL CUPS LIBICONV GETTEXT GLIB PKG-CONFIG LIBXML LIBFFI LIBGSF"    
-    pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT GLIB PKG-CONFIG LIBXML LIBXSLT LIBFFI LIBGSF"    
+    pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE XMLPARSER INTLTOOL GETTEXT LIBFFI PCRE GLIB PKG-CONFIG LIBXML LIBXSLT LIBGSF"    
 fi
 
@@ -26 +26 @@
   windows_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT GLIB LIBXML LIBGSF"
 
-  android_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT GLIB LIBXML DBUS LIBFFI LIBGSF"
+  android_pkglist="LIBZ LIBBZ2 EXPAT LIBPNG READLINE INTLTOOL LIBICONV GETTEXT LIBFFI GLIB LIBXML DBUS LIBGSF"
 
 

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 ...

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

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

@@ -2 +2 @@
 
 package=zlib
-version=-1.2.7
+version=-1.2.11
 
 progname=$0
@@ -33 +33 @@
     echo "[pushd $package$version]"
     ( cd $package$version ; \
-      echo $CROSSCONFIGURE_VARS ./configure --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ ; \
-      eval $CROSSCONFIGURE_VARS ./configure --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ )
+      echo $CROSSCONFIGURE_VARS ./configure --static --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ ; \
+      eval $CROSSCONFIGURE_VARS ./configure --static --prefix="$prefix" $CROSSCONFIGURE_ARGS $@ )
     if [ $? != 0 ] ; then
         echo "      Error encountered running *configure* stage of $progname"

gs2-extensions/gnome-lib/trunk/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

gs2-extensions/gnome-lib/trunk/src/packages/README.txt

@@ -41 +41 @@
 Besides the changes that were necessary to common-src/packages/configure, mgpp/jni/Makefile.in and mgpp/text/Makefile.in to use a system Mac, the gnome-lib extension's glib uses libiconv too and had to find the right one to get gconvert.c to compile properly. This required the following change, copied from glib-2.50.1.tar.xz (see also https://discussions.apple.com/thread/2378361?start=0&tstart=0, found searching google for: error: GNU libiconv not in use but included iconv.h is from libiconv macos).
 
-$diff gs-glib-2.28.1/glib/gconvert.c
-64,65c64
-< #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
----
-> #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) \
->   && !defined (__APPLE_CC__) && !defined (__LP_64__)
+ff gs-glib-2.28.1/glib/gconvert.c
+
+4. On 30/03/2021, the following customisations to glib-2.54.3/glib/gmessages.c were necessary as part of getting the gnome-lib (merged into main trunk from Mojave/Catalina branch) to compile on the 64 bit Linux LSB.
+
+These changes were taken from a future version of glib, at https://github.com/GNOME/glib/blob/master/glib/gmessages.c
+but should not affect Catalina or Mojave MacOS, as the #if defined tests for linux and next a test concerning Bionic, an Ubuntu distribution.
+
+
+a. Change:
+
+    #if defined(__linux__) && !defined(__BIONIC__)
+    static int
+    journal_sendv (struct iovec *iov,
+                       gsize         iovlen)
+
+To:
+    /* Enable support for the journal if we're on a recent enough Linux */
+    #if defined(__linux__) && !defined(__BIONIC__) && defined(HAVE_MKOSTEMP) && defined(O_CLOEXEC)
+    #define ENABLE_JOURNAL_SENDV
+    #endif
+
+    #ifdef ENABLE_JOURNAL_SENDV
+    static int
+    journal_sendv (struct iovec *iov,
+                       gsize         iovlen)
+
+
+
+b. And Change:
+    GLogWriterOutput
+    g_log_writer_journald (GLogLevelFlags   log_level,
+    const GLogField *fields,
+    gsize            n_fields,
+    gpointer         user_data)
+    {
+    #if defined(__linux__) && !defined(__BIONIC__)
+
+To:
+    GLogWriterOutput
+    g_log_writer_journald (GLogLevelFlags   log_level,
+    const GLogField *fields,
+    gsize            n_fields,
+    gpointer         user_data)
+    {
+    #ifdef ENABLE_JOURNAL_SENDV
+