Changeset 28939

Show
Ignore:
Timestamp:
20.03.2014 17:57:43 (6 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/packages/iconv/README.txt

    r26799 r28939  
    11 
    2 To compile this package using the Android NDK, the following auto-config 
     21. To compile this package using the Android NDK, the following auto-config 
    33files needed to be replaced with newer versions that included the 
    44'android' architecture as one of the valid host targets: 
     
    1515David Bainbridge 
    161629/1/2013 
     17 
     18 
     192. 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 
     20 
     21However, 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. 
     22 
     23Updated libiconv-1.11/lib/aliases.h 
     24From: 
     25#ifdef __GNUC__ 
     26__inline 
     27#endif 
     28const struct alias * 
     29aliases_lookup (register const char *str, register unsigned int len) 
     30{ 
     31 
     32To: 
     33#ifdef __GNUC__ 
     34__inline 
     35#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ 
     36__attribute__ ((__gnu_inline__)) 
     37#endif 
     38#endif 
     39const struct alias * 
     40aliases_lookup (register const char *str, register unsigned int len) 
     41{