Last change
on this file since 28939 was 28939, checked in by ak19, 10 years ago |
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.
|
File size:
1.6 KB
|
Rev | Line | |
---|
[26799] | 1 |
|
---|
[28939] | 2 | 1. To compile this package using the Android NDK, the following auto-config
|
---|
[26799] | 3 | files needed to be replaced with newer versions that included the
|
---|
| 4 | 'android' architecture as one of the valid host targets:
|
---|
| 5 |
|
---|
| 6 | libiconv-1.13.1/build-aux/config.sub
|
---|
| 7 | libiconv-1.13.1/build-aux/config.guess
|
---|
| 8 | libiconv-1.13.1/libcharset/build-aux/config.guess
|
---|
| 9 | libiconv-1.13.1/libcharset/build-aux/config.sub
|
---|
| 10 |
|
---|
| 11 | This has been done (using the 'config.sub' and 'config.guess' files
|
---|
| 12 | from the 'gnome-lib/android-extra' folder in the gs2-extensions area)
|
---|
| 13 | and the files to libiconv tarred up once more.
|
---|
| 14 |
|
---|
| 15 | David Bainbridge
|
---|
| 16 | 29/1/2013
|
---|
[28939] | 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
TracBrowser
for help on using the repository browser.