9306-more-cleanup.patch on Ticket #9603 – Attachment – Sage

SPKG.txt

# HG changeset patch
# User David Kirkby <david.kirkby@onetel.net>
# Date 1281469679 -3600
# Node ID c91f30ba571d12cf29edae1c4de37eb8be3d7bbc
# Parent  745799a814dda62b29714fb400b7a1b2c9e1c585
#9603 Address more reviewer comments. Mainly cosmetic, but also fix the fact $SAGE_LOCAL was not quoted.

diff -r 745799a814dd -r c91f30ba571d SPKG.txt

-                      a
 == iconv ==
+= iconv =
+== Description ==
+GNU libiconv is a library that is used to enable different
+languages, with different characters to be handled properly.
+For more details see http://www.gnu.org/software/libiconv/
+== Description ==
+GNU libiconv is a library that is used to enable different
+languages, with different characters to be handled properly.
 == License ==
+GPL 3 and LGPL 3. So we can link against the library ok.
+ * GPL 3 and LGPL 3. So we can link against the library in Sage
 == SPKG Maintainers ==
  * David Kirkby
+== Upstream Contact ==
+ * http://www.gnu.org/software/libiconv/
+ * Bug reports to bug-gnu-libiconv@gnu.org
 == Dependencies ==
+ * None for the purposes of Sage, but in general gettext.
+ * None for the purposes of Sage, but in general gettext.
 == Special Update/Build Instructions ==
+ * None
-  * spkg-install removes ALL files installed by iconv - man pages,
-    docs, etc etc. If iconv gets updated, check these still
-    remove all traces of iconv.
-    The sizes of the docs and man pages is small, so they are not
-    work removing from the package, as they potentially risk
-    breaking the install.
 == Changelog ==
+=== iconv-1.13.1.p3 (David Kirkby, July 26th 2010) ===
+ * Do not assume bash is in /bin, as it is not on HP-UX
+   Instead use #!/usr/bin/env bash as suggested in the
+   Sage deveopers guide.
+ * Force install of iconv on HP-UX in addition to the
+   two previous platforms this was installed on
+   (Solaris and Cygwin)
+ * Additionally force make-check to run on HP-UX
+ * Change the format of the tests in spkg-install and
+   spkg-check to be a little clearer.
+ * Add a few extra comments.
+=== iconv-1.13.1.p3 (David Kirkby, August 10th, 2010) ===
+ * No longer assume bash is in /bin, as it is not on HP-UX or AIX.
+   Instead use "#!/usr/bin/env bash", as suggested in the
+   Sage Developers Guide.
+ * Install iconv on HP-UX in addition to the two platforms iconv was
+   previously installed on (Solaris and Cygwin).
+ * Additionally force make-check to execute on HP-UX.
+ * Change the format of the tests in spkg-install and
+   spkg-check to be a little clearer.
+ * Add a few extra comments.
+ * Removed code to remove old files, to avoid causing any confusion.
+ * Quoted "$SAGE_LOCAL" where this had been omitted before
+ * Removed trailing white space on lines.
+ * Removed a surplus ; in both spkg-check and spkg-install.
+ * Added the "Upstream Contact" section to SPKG.txt
+ * Changed the "Special Update/Build Instructions" to be "none",
+   as what was written before was confusing.
 === iconv-1.13.1.p2 (John Palmieri, March 31st 2010) ===
  * spkg-check: only run 'make check' on Solaris and Cygwin.
 …
  * #8567 Ensure iconv only builds on Solaris and Cygwin as
    having two copies of iconv causes problems on some Linux systems.
 === iconv-1.13.1 (David Kirkby, February 13th 2010) ===
  * #8191 First release of libiconv, needed for R on Solaris
    and probably for Cygwin too (see #7319)

spkg-check

diff -r 745799a814dd -r c91f30ba571d spkg-check

-                      a
 #!/usr/bin/env bash
 if [ -z "$SAGE_LOCAL" ]; then
     echo "SAGE_LOCAL undefined ... exiting";
+    echo "SAGE_LOCAL undefined ... exiting"
     exit 1
 fi
 # Only test iconv on Solaris, HP-UX and Cygwin, at that is
 # the only platforms on which iconv is installed. On
 # other platforms Sage uses the system iconv.
+# Only test iconv on Solaris, HP-UX and Cygwin, as those are the only
+# platforms on which iconv is installed. On other platforms Sage uses
+# the system iconv.
 if [ "x$UNAME" = xSunOS ] || [ "x$UNAME" = xCYGWIN ] || [ "x$UNAME" = xHP-UX ]; then
    # We must test iconv, but on Solaris some tests will always fail.
+if [ "x$UNAME" = xSunOS ] || [ "x$UNAME" = xCYGWIN ] || [ "x$UNAME" = xHP-UX ]; then
+   # We must test iconv, but on Solaris some tests will always fail.
    if [ "x`uname`" = xSunOS ] ; then
       echo "If you see 3 core dumps, do not be too alarmed. See"
       echo "http://trac.sagemath.org/sage_trac/ticket/8270"
       echo "This is a Solaris bug and can be safely ignored"
       echo "http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6550204"
       echo "It will probably be fixed in later releases of Solaris 10"
       echo "It was fixed in build 66 of OpenSolaris."
    fi
+      echo "It will probably be fixed in later releases of Solaris 10"
+      echo "It was fixed in build 66 of OpenSolaris."
+   fi
    cd src
    make check
    if [ $? -ne 0 ]; then
        echo "Error encountered while running the iconv testsuite ... exiting"
+       echo "Error encountered while running the iconv test-suite ... exiting"
        exit 1
    fi
    echo "All the tests for iconv passed"
    exit 0
+   exit 0
 else
    echo "iconv was not be tested, as the system iconv will be used"
    echo "and not the iconv supplied with Sage. The iconv"
+   echo "and not the iconv supplied with Sage. The iconv"
    echo "supplied with Sage is only used on Cygwin, HP-UX and Solaris"
    exit 0
 fi

spkg-install

diff -r 745799a814dd -r c91f30ba571d spkg-install

-                      a
 #!/usr/bin/env bash
 if [ -z "$SAGE_LOCAL" ] ; then
    echo "SAGE_LOCAL undefined ... exiting";
+if [ -z "$SAGE_LOCAL" ]; then
+   echo "SAGE_LOCAL undefined ... exiting"
    echo "Maybe run 'sage -sh'?"
    exit 1
 fi
 # Only build iconv on Solaris, HP-UX and Cygwin
 # See
+# See
 # http://trac.sagemath.org/sage_trac/ticket/8567
 # and http://trac.sagemath.org/sage_trac/ticket/9603
 if [ "x$UNAME" = xSunOS ] || [ "x$UNAME" = xHP-UX ] || [ "x$UNAME" = xCYGWIN ] ; then
+if [ "x$UNAME" = xSunOS ] || [ "x$UNAME" = xHP-UX ] || [ "x$UNAME" = xCYGWIN ]; then
    echo "iconv will be installed as the operating system is Cygwin, HP-UX or Solaris"
    echo "These system either lack iconv, or do not have a sufficiently capable"
    echo "iconv. See:"
    echo "http://trac.sagemath.org/sage_trac/ticket/8567"
    echo "http://trac.sagemath.org/sage_trac/ticket/9603"
-   echo "First removing old iconv files if they exist"
-   # If iconv is updated, please double-check these are still necessary
-   # and that there are no extra files added.
-   rm -f $SAGE_LOCAL/bin/iconv  $SAGE_LOCAL/lib/charset.alias
-   rm -f $SAGE_LOCAL/lib/*libiconv*  $SAGE_LOCAL/lib/libcharset*
-   rm -f $SAGE_LOCAL/include/iconv.h  $SAGE_LOCAL/include/libcharset.h
-   rm -f $SAGE_LOCAL/include/localcharset.h
-   rm -rf  $SAGE_LOCAL/share/doc/libiconv
-   rm -f $SAGE_LOCAL/share/man/man1/iconv* $SAGE_LOCAL/share/man/man3/iconv*
    # 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
    # Add option for a 64-bit build if needed.
    if [ "x$SAGE64" = xyes ] ; then
       CFLAGS="$CFLAG64"
+   # If the environment variable SAGE64="yes", then build a 64-bit version.
+   if [ "x$SAGE64" = xyes ]; then
+      CFLAGS="$CFLAGS $CFLAG64"
       export CFLAGS
+      echo "Building a 64-bit version of iconv"
    fi
    cd src
    ./configure --prefix=$SAGE_LOCAL
+   ./configure --prefix="$SAGE_LOCAL"
    if [ $? -ne 0 ]; then
       echo "Error configuring iconv"
       exit 1
    fi
    make
+   make
    if [ $? -ne 0 ]; then
       echo "Error building iconv"
       exit 1

Context Navigation

Ticket #9603: 9306-more-cleanup.patch

SPKG.txt

spkg-check

spkg-install

Download in other formats: