Changeset 28946 for main/trunk/greenstone2

Timestamp:

2014-03-21T20:59:26+13:00 (10 years ago)

Author:

ak19

Message:

Moving libiconv-1.11.tar.gz to gs-libiconv-1.11.tar.gz since we've incorporated a custom change to the original libiconv-1.11 version of the package that can be downloaded from the web. Updated the configure file to reflect this and the README in common-src/packages/iconv too. Tested compiling on Lion and it all still works.

Location:

main/trunk/greenstone2/common-src/packages

Files:

• configure (modified) (1 diff)
• iconv/README.txt (modified) (1 diff)
• iconv/gs-libiconv-1.11.tar.gz (moved) (moved from main/trunk/greenstone2/common-src/packages/iconv/libiconv-1.11.tar.gz )

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

@@ -196 +196 @@
 else
     if test ! -d libiconv-1.11 ; then
-    gzip -dc libiconv-1.11.tar.gz | tar -xf -
+    gzip -dc gs-libiconv-1.11.tar.gz | tar -xf -
     fi
     cd "$PACKAGES/iconv/libiconv-1.11"

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

@@ -17 +17 @@
 
 
-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
+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 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.
+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