Ticket #9603: trac_9603-iconv_spkg-optional_second_reviewer.patch

File trac_9603-iconv_spkg-optional_second_reviewer.patch, 3.6 KB (added by leif, 12 years ago)

Optional SPKG patch. Apply on top of first reviewer patch. (Stylistic change.))

  • SPKG.txt

    # HG changeset patch
    # User Leif Leonhardy <not.really@online.de>
    # Date 1283967554 -7200
    # Node ID 7ffde08f86a0a46cfef84c0f9c0be25477bbba42
    # Parent  e5178b991bd2e50da3f184874fe74f9958b128a6
    #9603: Stylistic change: Use 'case' statements for $UNAME case distinctions.
    
    diff -r e5178b991bd2 -r 7ffde08f86a0 SPKG.txt
    a b  
    4848   Developers Guide.
    4949 * Consistently use "$UNAME" (which is set by 'sage-env') rather than
    5050   `uname`. (Reviewer change. Also further cosmetic changes.)
     51 * Stylistic change: Use 'case' statements for $UNAME case distinctions
     52   rather than (nested) 'if's with or-lists of 'test' statements.
     53   (Reviewer change, too.)
    5154 * All patches/changes made at #9603.
    5255
    5356=== iconv-1.13.1.p2 (John Palmieri, March 31st 2010) ===
  • spkg-check

    diff -r e5178b991bd2 -r 7ffde08f86a0 spkg-check
    a b  
    99# platforms on which the iconv shipped with Sage will be installed. On
    1010# other platforms Sage uses the system's iconv.
    1111
    12 if [ "x$UNAME" = xSunOS ] || [ "x$UNAME" = xCYGWIN ] || [ "x$UNAME" = xHP-UX ]; then
     12case "$UNAME" in
     13SunOS)
    1314    # We must test iconv, but on Solaris some tests will always fail.
    14     if [ "x$UNAME" = xSunOS ]; then
    15         echo "If you see 3 core dumps, do not be too alarmed."
    16         echo "This is a known Solaris bug and can safely be ignored."
    17         echo "See http://trac.sagemath.org/sage_trac/ticket/8270"
    18         echo "It will probably be fixed in later releases of Solaris 10,"
    19         echo "and was fixed in build 66 of OpenSolaris:"
    20         echo "http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6550204"
    21     fi
     15    echo "If you see 3 core dumps, don't be too alarmed."
     16    echo "This is a known Solaris bug and can safely be ignored. See"
     17    echo "    http://trac.sagemath.org/sage_trac/ticket/8270"
     18    echo "It will probably be fixed in later releases of Solaris 10,"
     19    echo "and was fixed in build 66 of OpenSolaris:"
     20    echo "    http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6550204"
     21    ;&
     22CYGWIN|HP-UX)
    2223
    2324    cd src
    2425
     
    3031    fi
    3132    echo "All the tests for iconv passed."
    3233    exit 0
    33 else
     34    ;;
     35*) # Not CYGWIN, HP-UX or SunOS (Solaris)
    3436    echo "iconv was not to be tested, since Sage will use the system's iconv"
    3537    echo "and not the one shipped with Sage."
    3638    echo "The iconv supplied by Sage is only used on Cygwin, HP-UX and Solaris."
    3739    exit 0
    38 fi
     40esac
    3941
    4042# NOT REACHED
    4143
  • spkg-install

    diff -r e5178b991bd2 -r 7ffde08f86a0 spkg-install
    a b  
    1111#     http://trac.sagemath.org/sage_trac/ticket/9603
    1212# for details.
    1313
    14 if [ "x$UNAME" = xSunOS ] || [ "x$UNAME" = xHP-UX ] || [ "x$UNAME" = xCYGWIN ];
    15 then
     14case "$UNAME" in
     15CYGWIN|HP-UX|SunOS)
    1616    echo "iconv will be installed as the operating system is Cygwin, HP-UX or Solaris."
    1717    echo "These systems either lack iconv, or do not have a sufficiently capable"
    1818    echo "version of iconv. See:"
     
    5656        exit 1
    5757    fi
    5858    exit 0
    59 else
     59    ;;
     60*)  # Not CYGWIN, HP-UX or SunOS (Solaris)
    6061    echo "iconv will not be installed, as we only need to build it on"
    6162    echo "Solaris, HP-UX and Cygwin, as the system's iconv will be used"
    6263    echo "on other platforms, rather than the one shipped with Sage."
     
    6465    echo "    http://trac.sagemath.org/sage_trac/ticket/8567"
    6566    echo "    http://trac.sagemath.org/sage_trac/ticket/9603"
    6667    exit 0
    67 fi
     68esac
    6869
    6970# NOT REACHED
    7071