Ticket #13348: 13348_CPATH.patch

File 13348_CPATH.patch, 1.5 KB (added by jdemeyer, 10 years ago)

  • spkg/bin/sage-env 

    # HG changeset patch
# User Jeroen Demeyer <jdemeyer@cage.ugent.be>
# Date 1347281432 -7200
# Node ID 419d3d398d99cb97f77ca14cdba779c3db9c7fed
# Parent  4ff871b029a8e117b512828ced50a71842799000
Set CPATH in sage-env

diff --git a/spkg/bin/sage-env b/spkg/bin/sage-env
    a b  
    236236
    237237# Mac OS X-specific setup
    238238if [ `uname` = "Darwin" ]; then
    239     # For a framework Python build on OS X, Python's bin directory is not local/bin
    240     PATH="$SAGE_LOCAL/Frameworks/Python.framework/Versions/2.5/bin:$PATH" && export PATH
    241 
    242239    # set MACOSX_DEPLOYMENT_TARGET -- if set incorrectly, this can
    243240    # cause lots of random "Abort trap" issues on OSX. see trac
    244241    # #7095 for an example.
    … …  
    247244    export MACOSX_DEPLOYMENT_TARGET
    248245fi
    249246
    250 if [ "$LIBRARY_PATH" != "" ]; then
    251     LIBRARY_PATH="$SAGE_LOCAL/lib/:$LIBRARY_PATH"
    252 else
    253     LIBRARY_PATH="$SAGE_LOCAL/lib/"
    254 fi
    255 export LIBRARY_PATH
     247# Compile-time path for libraries.  This is the equivalent of
     248# adding the gcc option -L $SAGE_LOCAL/lib.
     249[ -z "$LIBRARY_PATH" ] || LIBRARY_PATH="${LIBRARY_PATH}:"
     250export LIBRARY_PATH="${LIBRARY_PATH}$SAGE_LOCAL/lib"
    256251
     252# Compile-time path for include files.  This is the equivalent of
     253# adding the gcc option -I $SAGE_LOCAL/include.
     254[ -z "$CPATH" ] || CPATH="${CPATH}:"
     255export CPATH="${CPATH}$SAGE_LOCAL/include"
     256
     257# For PARI/GP
    257258GP_DATA_DIR="$SAGE_LOCAL/share/pari" && export GP_DATA_DIR
    258259GPHELP="$SAGE_LOCAL/bin/gphelp" && export GPHELP
    259260GPDOCDIR="$SAGE_LOCAL/share/pari/doc" && export GPDOCDIR