Ticket #9603: 9603-parallel-and-HP-UX.patch

File 9603-parallel-and-HP-UX.patch, 2.6 KB (added by drkirkby, 12 years ago)

Replaces 'make' by '$MAKE'. Hopefully the last patch needed!

  • SPKG.txt

    # HG changeset patch
    # User David Kirkby <david.kirkby@onetel.net>
    # Date 1282862168 -3600
    # Node ID db6e4a8c74d8bb6846d79269dccfdf1f44958e22
    # Parent  c91f30ba571d12cf29edae1c4de37eb8be3d7bbc
    #9603 Use $MAKE instead of 'make' to speed up parallel builds.
    
    diff -r c91f30ba571d -r db6e4a8c74d8 SPKG.txt
    a b  
    1818 * None for the purposes of Sage, but in general gettext.
    1919
    2020== Special Update/Build Instructions ==
    21  * None
     21 * None, other than anyone updating this package should be familiar with how
     22   to write shell scripts.
    2223 
    2324== Changelog ==
    2425 
    2526=== iconv-1.13.1.p3 (David Kirkby, August 10th, 2010) ===
    26  * No longer assume bash is in /bin, as it is not on HP-UX or AIX.
    27    Instead use "#!/usr/bin/env bash", as suggested in the
    28    Sage Developers Guide.
    29  * Install iconv on HP-UX in addition to the two platforms iconv was
    30    previously installed on (Solaris and Cygwin).
    31  * Additionally force make-check to execute on HP-UX.
     27 * Use '$MAKE' instead of 'make' in spkg-install and spkg-check
     28   to enable parallel builds.
    3229 * Change the format of the tests in spkg-install and
    3330   spkg-check to be a little clearer.
    3431 * Add a few extra comments.
     
    3936 * Added the "Upstream Contact" section to SPKG.txt
    4037 * Changed the "Special Update/Build Instructions" to be "none",
    4138   as what was written before was confusing.
     39 * Install iconv on HP-UX in addition to the two platforms iconv was
     40   previously installed on (Solaris and Cygwin).
     41 * Additionally force make-check to execute on HP-UX.
     42 * No longer assume bash is in /bin, as it is not on HP-UX or AIX.
     43   Instead use "#!/usr/bin/env bash", as suggested in the
     44   Sage Developers Guide.
    4245 
    4346=== iconv-1.13.1.p2 (John Palmieri, March 31st 2010) ===
    4447 * spkg-check: only run 'make check' on Solaris and Cygwin.
  • spkg-check

    diff -r c91f30ba571d -r db6e4a8c74d8 spkg-check
    a b  
    2222
    2323   cd src
    2424
    25    make check
     25   $MAKE check
    2626
    2727   if [ $? -ne 0 ]; then
    2828       echo "Error encountered while running the iconv test-suite ... exiting"
  • spkg-install

    diff -r c91f30ba571d -r db6e4a8c74d8 spkg-install
    a b  
    3838      exit 1
    3939   fi
    4040
    41    make
     41   $MAKE
    4242   if [ $? -ne 0 ]; then
    4343      echo "Error building iconv"
    4444      exit 1
    4545   fi
    4646
    47    make install
     47   $MAKE install
    4848   if [ $? -ne 0 ]; then
    4949      echo "Error installing iconv"
    5050      exit 1