1. To compile this package using the Android NDK, the following auto-config
files needed to be replaced with newer versions that included the
'android' architecture as one of the valid host targets:

 libiconv-1.13.1/build-aux/config.sub  
 libiconv-1.13.1/build-aux/config.guess 
 libiconv-1.13.1/libcharset/build-aux/config.guess  
 libiconv-1.13.1/libcharset/build-aux/config.sub  

This has been done (using the 'config.sub' and 'config.guess' files
from the 'gnome-lib/android-extra' folder in the gs2-extensions area)
and the files to libiconv tarred up once more.

David Bainbridge
29/1/2013


2. Sam had included libiconv-1.11 specifically for mac machines. Linux machines use libiconv-1.13.1. See http://trac.greenstone.org/changeset/23714 and common-src/packages/configure

However, around late February 2014, GS2 stopped compiling on the Mac Lion and nightly binaries failed to generate, since libiconv-1.11 failed to compile successfully on there. Dr Bainbridge found that libiconv-1.14 would compile and that it featured a change in aliases.h in that place that he suspected to have harboured the error in 1.11. The change was incorporated into libiconv-1.11 and this now compiles on Lion again while still continuing to compile on Mac Leopard. As a consequence of us making this change, the libiconv-1.11.tar.gz was recommitted to SVN with the gs- prefix to indicate we changed it. The new name is gs-libiconv-1.11.tar.gz, but it extracts as before as the folder libiconv-1.11

Updated libiconv-1.11/lib/aliases.h
From:
#ifdef __GNUC__
__inline
#endif
const struct alias *
aliases_lookup (register const char *str, register unsigned int len)
{

To:
#ifdef __GNUC__
__inline
#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
__attribute__ ((__gnu_inline__))
#endif
#endif
const struct alias *
aliases_lookup (register const char *str, register unsigned int len)
{