[sagemath] 01/01: Debian binary policy: use LD_LIBRARY_PATH instead of rpath

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagemath.

commit 986e459a019b2dda1ea41376b32e8174dfd4beef
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Oct 18 03:12:29 2016 +0200

    Debian binary policy: use LD_LIBRARY_PATH instead of rpath
---
 debian/patches/debian-install-paths.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/debian/patches/debian-install-paths.patch b/debian/patches/debian-install-paths.patch
index 346c3a2..1606a18 100644
--- a/debian/patches/debian-install-paths.patch
+++ b/debian/patches/debian-install-paths.patch
@@ -5,6 +5,8 @@ Description: Install to Debian paths
  .
  The multidocs.py patch looks like a Sage upstream bug, that probably needs to
  be forwarded.
+ .
+ The LD_LIBRARY_PATH can probably be forwarded upstream, either way is fine.
 Author: Tobias Hansen <thansen at debian.org>
 Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: not-needed
@@ -60,6 +62,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  if [ -n "$IPYTHONDIR" ]; then
      export IPYTHONDIR="$DOT_SAGE/${IPYTHONDIR##*/}"
  fi
+@@ -397,8 +389,10 @@
+     export PYTHONHOME
+ fi
+ 
+-LDFLAGS="-L$SAGE_LOCAL/lib -Wl,-rpath,$SAGE_LOCAL/lib $LDFLAGS"
++LDFLAGS="-L$SAGE_LOCAL/lib $LDFLAGS"
+ export LDFLAGS
++LD_LIBRARY_PATH="$SAGE_LOCAL/lib:$LD_LIBRARY_PATH"
++export LD_LIBRARY_PATH
+ 
+ # Use a matplotlib config directory specific to Sage and specific to
+ # the version number of matplotlib, by setting the environment
 --- a/sage/src/sage_setup/clean.py
 +++ b/sage/src/sage_setup/clean.py
 @@ -85,7 +85,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagemath.git