Ticket #13912: iconv-1.13.1.p4.diff

SPKG.txt

@@ -23 +23 @@
 
 == Changelog ==
 
+=== iconv-1.13.1.p4 (Jean-Pierre Flori, 5 January 2013) ===
+ * #13912: let iconv build on Cygwin without additional prereqs.
+
 === iconv-1.13.1.p3 (David Kirkby, August 10th, 2010) ===
  * Use '$MAKE' instead of 'make' in spkg-install and spkg-check to enable
    parallel builds, and allow the user to specify a different 'make' program.

spkg-install

@@ -1 +1 @@
 #!/usr/bin/env bash
 
 if [ -z "$SAGE_LOCAL" ]; then
-    echo "SAGE_LOCAL undefined ... exiting"
-    echo "Maybe run 'sage -sh'?"
+    echo >&2 "SAGE_LOCAL undefined ... exiting"
+    echo >&2 "Maybe run 'sage -sh'?"
     exit 1
 fi
 
@@ -21 +21 @@
 
     # Let an environment variable CFLAG64 specify the option to generate 64-bit
     # code. If this is not set, default to -m64:
-    if [ -z "$CFLAG64" ]; then 
+    if [ -z "$CFLAG64" ]; then
         CFLAG64=-m64
     fi
 
@@ -36 +36 @@
         export CC
     fi
 
+    # Disable NLS on Cygwin to be able to build libiconv without the Cygwin
+    # libiconv package.
+    if [ "$UNAME" = "CYGWIN" ]; then
+        ICONV_CONFIGURE="--disable-nls $ICONV_CONFIGURE"
+    fi
+
     cd src
 
-    ./configure --prefix="$SAGE_LOCAL"
+    ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" $ICONV_CONFIGURE
     if [ $? -ne 0 ]; then
-        echo "Error configuring iconv"
+        echo >&2 "Error configuring iconv"
         exit 1
     fi
 
     $MAKE
     if [ $? -ne 0 ]; then
-        echo "Error building iconv"
+        echo >&2 "Error building iconv"
         exit 1
     fi
 
     $MAKE install
     if [ $? -ne 0 ]; then
-        echo "Error installing iconv"
+        echo >&2 "Error installing iconv"
         exit 1
     fi
     exit 0
@@ -68 +74 @@
 esac
 
 # NOT REACHED
-