Ignore:
Timestamp:
2021-04-01T11:55:33+13:00 (7 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • gs2-extensions/gnome-lib/trunk/src/packages/README.txt

    r30862 r34983  
    4141Besides 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).
    4242
    43 $diff gs-glib-2.28.1/glib/gconvert.c
    44 64,65c64
    45 < #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
    46 ---
    47 > #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) \
    48 >   && !defined (__APPLE_CC__) && !defined (__LP_64__)
     43ff gs-glib-2.28.1/glib/gconvert.c
     44
     454. 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.
     46
     47These changes were taken from a future version of glib, at https://github.com/GNOME/glib/blob/master/glib/gmessages.c
     48but should not affect Catalina or Mojave MacOS, as the #if defined tests for linux and next a test concerning Bionic, an Ubuntu distribution.
     49
     50
     51a. Change:
     52
     53    #if defined(__linux__) && !defined(__BIONIC__)
     54    static int
     55    journal_sendv (struct iovec *iov,
     56                       gsize         iovlen)
     57
     58To:
     59    /* Enable support for the journal if we're on a recent enough Linux */
     60    #if defined(__linux__) && !defined(__BIONIC__) && defined(HAVE_MKOSTEMP) && defined(O_CLOEXEC)
     61    #define ENABLE_JOURNAL_SENDV
     62    #endif
     63
     64    #ifdef ENABLE_JOURNAL_SENDV
     65    static int
     66    journal_sendv (struct iovec *iov,
     67                       gsize         iovlen)
     68
     69
     70
     71b. And Change:
     72    GLogWriterOutput
     73    g_log_writer_journald (GLogLevelFlags   log_level,
     74    const GLogField *fields,
     75    gsize            n_fields,
     76    gpointer         user_data)
     77    {
     78    #if defined(__linux__) && !defined(__BIONIC__)
     79
     80To:
     81    GLogWriterOutput
     82    g_log_writer_journald (GLogLevelFlags   log_level,
     83    const GLogField *fields,
     84    gsize            n_fields,
     85    gpointer         user_data)
     86    {
     87    #ifdef ENABLE_JOURNAL_SENDV
     88
Note: See TracChangeset for help on using the changeset viewer.