Ticket #10016: trac_10016-r-2.10.1.p3-p4.spkg.patch

File trac_10016-r-2.10.1.p3-p4.spkg.patch, 3.2 KB (added by leif, 11 years ago)

Diff between the p3 and p4 spkg (actually a Mercurial patch). For reference/review.

  • SPKG.txt

    # HG changeset patch
    # User Leif Leonhardy <not.really@online.de>
    # Date 1285448826 -7200
    # Node ID 30830fa63750670c67f6d02011727ab07bb22d01
    # Parent  81f7b8c66cb9456958cdc1f202f17137748c5549
    #10016 Call sage-spkg directly rather than via "sage -f" (and unavailable sage-sage).
    
    === r-2.10.1.p4 (Leif Leonhardy, September 25th 2010) ===
     * #10016: Don't call "sage -f" on the included Rpy spkg, instead call
       "sage-spkg -f" directly, since only this is guaranteed to be present.
       This is just a temporary solution, until the Rpy spkg is removed
       from this one.
    
    diff -r 81f7b8c66cb9 -r 30830fa63750 SPKG.txt
    a b  
    1818== Dependencies ==
    1919 * ATLAS
    2020
    21 == Build Notes ==
     21== Special Update/Build Instructions ==
     22 * TODO: Remove the contained Rpy spkg and ship (and maintain)
     23   it separately, for many reasons. (#9906 addresses this.)
     24 * TODO: Clean up spkg-install.
    2225
    2326== Changelog ==
    2427
     28=== r-2.10.1.p4 (Leif Leonhardy, September 25th 2010) ===
     29 * #10016: Don't call "sage -f" on the included Rpy spkg, instead call
     30   "sage-spkg -f" directly, since only this is guaranteed to be present.
     31   This is just a temporary solution, until the Rpy spkg is removed
     32   from this one.
     33
    2534=== r-2.10.1.p3 (Mariah Lenox, 30 Jun 2010) ===
    2635 * added "--with-ICU=no" to configure line of spkg-install (#9396)
    2736
  • spkg-install

    diff -r 81f7b8c66cb9 -r 30830fa63750 spkg-install
    a b  
    154154cd "$CUR"/patches
    155155python fix_hardcode
    156156
    157 echo "Now install rpy"
     157cd "$CUR"
    158158
    159 cd "$CUR"
    160159
    161160RPY_VER=rpy2-2.0.8
    162161
    163 sage -f "$RPY_VER".spkg
    164 if [ ! -f "$SAGE_ROOT"/spkg/installed/"$RPY_VER" ]; then
    165     echo "Error installing rpy."
     162echo "Now installing the contained Rpy ($RPY_VER) spkg..."
     163
     164# Do NOT call $SAGE_ROOT/sage here, since $SAGE_LOCAL/bin/sage-sage
     165# might not yet exist.
     166# See http://trac.sagemath.org/sage_trac/ticket/8306#comment:29
     167# and http://trac.sagemath.org/sage_trac/ticket/9896#comment:95
     168# Instead, as a temporary solution before Rpy gets removed from
     169# R's spkg (#9906), call $SAGE_LOCAL/bin/sage-spkg directly since
     170# it is present in any case (installed by spkg/base/dir-0.1-install)
     171# and the environment is already set up:
     172
     173# sage -f "$RPY_VER".spkg # EVIL
     174
     175# Sanity check, should never happen:
     176if [ ! -x "$SAGE_LOCAL/bin/sage-spkg" ]; then
     177    echo "Error: Fatal dependency error:"
     178    echo "    $SAGE_LOCAL/bin/sage-spkg"
     179    echp "does not (yet) exist (or isn't executable):"
     180    ls -l "$SAGE_LOCAL/bin/sage-spkg"
     181    echo "Please report this to one of the Google groups"
     182    echo "    sage-devel or sage-release."
     183    echo "Error installing Rpy, which is part of the R spkg."
     184    exit 1
     185fi
     186
     187# Avoid trouble with pipestatus and spaces in the spkg's pathname:
     188export RPY_PKG=$CUR/$RPY_VER.spkg
     189
     190# sage-spkg is in the PATH (but not pipestatus):
     191"$SAGE_ROOT/spkg/pipestatus" \
     192    "sage-spkg -f '$RPY_PKG' 2>&1" \
     193    "tee -a '$SAGE_ROOT/spkg/logs/'$RPY_VER.log"
     194
     195if [ $? -ne 0 ] || [ ! -f "$SAGE_ROOT"/spkg/installed/"$RPY_VER" ]; then
     196    echo "Error installing Rpy, which is part of the R spkg."
    166197    exit 1
    167198fi
    168199