Changeset 28939 for main/trunk
- Timestamp:
- 2014-03-20T17:57:43+13:00 (10 years ago)
- Location:
- main/trunk/greenstone2/common-src/packages/iconv
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/packages/iconv/README.txt
r26799 r28939 1 1 2 To compile this package using the Android NDK, the following auto-config2 1. To compile this package using the Android NDK, the following auto-config 3 3 files needed to be replaced with newer versions that included the 4 4 'android' architecture as one of the valid host targets: … … 15 15 David Bainbridge 16 16 29/1/2013 17 18 19 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 20 21 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. 22 23 Updated libiconv-1.11/lib/aliases.h 24 From: 25 #ifdef __GNUC__ 26 __inline 27 #endif 28 const struct alias * 29 aliases_lookup (register const char *str, register unsigned int len) 30 { 31 32 To: 33 #ifdef __GNUC__ 34 __inline 35 #if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ 36 __attribute__ ((__gnu_inline__)) 37 #endif 38 #endif 39 const struct alias * 40 aliases_lookup (register const char *str, register unsigned int len) 41 {
Note:
See TracChangeset
for help on using the changeset viewer.