Ticket #14380: trac_14380.patch

File trac_14380.patch, 934 bytes (added by jpflori, 9 years ago)

  • spkg/bin/sage-env 

    # HG changeset patch
# User Jean-Pierre Flori <jean-pierre.flori@ssi.gouv.fr>
# Date 1364565677 -3600
# Node ID 84e5bc8f3c0dd5ca09f3d7e55642be1e6f936da4
# Parent  d81cc4bc6375cc7f2b70dd423ba1d2049b2b684b
#14380: tweak PATH and LD_LIBRARY_PATH on Cygwin

diff --git a/spkg/bin/sage-env b/spkg/bin/sage-env
    a b  
    550550fi
    551551
    552552if [ "$UNAME" = "CYGWIN" ]; then
    553     PATH="$PATH:$SAGE_LOCAL/lib:$SAGE_LOCAL/lib/R/lib" && export PATH
     553    # Cygwin needs pathnames in PATH to resolve runtime dependencies
     554    PATH="$SAGE_LOCAL/lib/R/lib:$SAGE_LOCAL/lib:$PATH" && export PATH
     555    # And "dlopen" needs them in LD_LIBRARY_PATH, just as on Linuces,
     556    # except that on Cygwin shared libraries are usually stored in "bin"
     557    # and not in "lib"
     558    LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
    554559fi
    555560
    556561# See trac 7186 -- this is needed if ecl is moved