Changeset 28939 for main/trunk

Timestamp:

2014-03-20T17:57:43+13:00 (10 years ago)

Author:

ak19

Message:

Fix to libiconv-1.11 (which Sam had set up specifically for Macs, as linux used 1.13.1) so that it now compiles on Mac Lion. It still compiles on Leopard.

Location:

main/trunk/greenstone2/common-src/packages/iconv

Files:

• README.txt (modified) (2 diffs)
• libiconv-1.11.tar.gz (modified) ( previous)

main/trunk/greenstone2/common-src/packages/iconv/README.txt

@@ -1 +1 @@
 
-To compile this package using the Android NDK, the following auto-config
+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:
@@ -15 +15 @@
 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 the 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 featured a change in aliases.h in the place 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.
+
+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)
+{