Ticket #9603: 9603.patch

File 9603.patch, 2.4 KB (added by drkirkby, 12 years ago)

Mercurial patch to force iconv to build on HP-UX in addition to the Solaris and Cygwin it currently builds on. iconv passes all tests on HP-UX. The changes will have no effect on other platforms.

  • SPKG.txt

    # HG changeset patch
    # User David Kirkby <david.kirkby@onetel.net>
    # Date 1280152005 -3600
    # Node ID b7e7f98753a077ffc901ef8163115fd57df6dc23
    # Parent  32e7f7a36ceae8858c8f21608540d2b87b61c9ce
    #Force iconv to build on HP-UX in addition to the previous Solaris and Cygwin
    
    diff -r 32e7f7a36cea -r b7e7f98753a0 SPKG.txt
    a b  
    2828
    2929== Changelog ==
    3030 
     31=== iconv-1.13.1.p3 (David Kirkby, July 26th 2010) ===
     32 * Do not assume bash is in /bin, as it is not on HP-UX
     33   Instead use #!/usr/bin/env bash as suggested in the
     34   Sage deveopers guide.
     35 * Force install of iconv on HP-UX in addition to the
     36   two previous platforms this was installed on
     37   (Solaris and Cygwin)
     38 * Additionally force make-check to run on HP-UX
     39 
    3140=== iconv-1.13.1.p2 (John Palmieri, March 31st 2010) ===
    3241 * spkg-check: only run 'make check' on Solaris and Cygwin.
    3342
  • spkg-check

    diff -r 32e7f7a36cea -r b7e7f98753a0 spkg-check
    a b  
    1 #!/bin/bash
     1#!/usr/bin/env bash
    22
    33if [ -z "$SAGE_LOCAL" ]; then
    44    echo "SAGE_LOCAL undefined ... exiting";
    55    exit 1
    66fi
    77
    8 # Only test iconv on Solaris and Cygwin
    9 if [ "x$UNAME" != xSunOS ] && [ "x$UNAME" != xCYGWIN ] ; then 
     8# Only test iconv on Solaris, HP-UX and Cygwin
     9if [ "x$UNAME" != xSunOS ] && [ "x$UNAME" != xCYGWIN ] && [ "x$UNAME" != xHP-UX ]; then 
    1010  echo "'make check' for iconv will not be run, since iconv is"
    11   echo "only installed on Solaris and Cygwin - see:"
     11  echo "only installed on HP-UX, Solaris and Cygwin - see:"
    1212  echo "http://trac.sagemath.org/sage_trac/ticket/8567"
    1313  exit 0
    1414fi
     
    3030    exit 1
    3131fi
    3232
     33echo "All the tests for iconv passed"
     34exit 0
  • spkg-install

    diff -r 32e7f7a36cea -r b7e7f98753a0 spkg-install
    a b  
    77fi
    88
    99
    10 # Only build iconv on Solaris and Cygwin
    11 if [ "x$UNAME" != xSunOS ] && [ "x$UNAME" != xCYGWIN ] ; then 
     10# Only build iconv on Solaris, HP-UX and Cygwin
     11if [ "x$UNAME" != xSunOS ] && [ "x$UNAME" != xHP-UX ] && [ "x$UNAME" != xCYGWIN ] ; then 
    1212  echo "iconv will not be installed, as we only need to build it on"
    13   echo "Solaris and Cygwin - see:"
     13  echo "Solaris, HP-UX and Cygwin - see:"
    1414  echo "http://trac.sagemath.org/sage_trac/ticket/8567"
    1515  exit 0
    1616fi