Ignore:
Timestamp:
2016-10-14T18:24:13+13:00 (5 years ago)
Author:
ak19
Message:

Changes to get libiconv issues on MacOS El Capitan straightened out, since DYLD_LIBRARY_PATH gets wiped out on these newer Mac OS versions. The current solution is to use the system libiconv on MacOS machines that are already specific to Macs (and therefore compatible with Macs).

File:
1 edited

Legend:

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

    r27633 r30862  
    3535-    once_control = PTHREAD_ONCE_INIT;
    3636+    once_control = once_control_init;
     37
     38
     393. On 14 Oct 2016, Dr Bainbridge reworked Greenstone for the upcomign 3.08 release to use the system libiconv for MacOS, since we found that using the 2 versions of libiconv included with GS didn't work with Mac El Capitan (Mac 10.11.3/v15 when testing with `uname -r`), because the DYLD_LIBRARY_PATH was being emptied on these newer Macs. The solution was to get MacOS to use the system libiconv (libiconv.2.dylib which is actually libiconv.2.4.0.dylib, see https://discussions.apple.com/thread/1931034?start=0&tstart=0) , since the MacOS had its own tweaked libiconv that would work on Macs, and its presence in a system location seemed to be a given.
     40
     41Besides 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).
     42
     43$diff gs-glib-2.28.1/glib/gconvert.c
     4464,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__)
Note: See TracChangeset for help on using the changeset viewer.