[sagemath] 02/02: Make cysignals use multiarch paths

[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 472b1e54ef3d3f2fee0c41c1021f8601190e4e74
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Jul 7 14:34:56 2016 +0200

    Make cysignals use multiarch paths
---
 debian/README.Debian                          |  4 ++--
 debian/patches/cysignals-multiarch-path.patch | 21 +++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 233eb93..ccfc5a3 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -17,8 +17,8 @@ also need sage to -lflint-arb instead of -larb (or perhaps Debian needs to
 install it as libarb.so; check upstream to see what they prefer). as a temp
 workaround you can `ln -s libflint-arb.so /usr/lib/libarb.so`.
 
-3. Post-compilation docbuild segfaults due to bad LD paths;
-figure out how to fix this
+3. Post-compilation docbuild segfaults, crash log is empty :S
+Need to figure this out. Perhaps due to NTL transition mismatch.
 
 ## TODO (required to get into Debian archives)
 
diff --git a/debian/patches/cysignals-multiarch-path.patch b/debian/patches/cysignals-multiarch-path.patch
new file mode 100644
index 0000000..e87d404
--- /dev/null
+++ b/debian/patches/cysignals-multiarch-path.patch
@@ -0,0 +1,21 @@
+Description: Make cysignals use multiarch paths
+ Cysignals uses a very naive way of loading libpython2.7, fix this for Debian
+ When we package cysignals for Debian, we will need to move this patch there.
+ Also, hey dawg i herd u liek patches
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- /dev/null
++++ b/sage/build/pkgs/cysignals/patches/multiarch-path.patch
+@@ -0,0 +1,10 @@
++--- src/scripts/cysignals-CSI	2016-07-07 14:28:52.333831922 +0200
+++++ src/scripts/cysignals-CSI	2016-07-07 14:27:14.542616423 +0200
++@@ -84,6 +84,7 @@
++     """
++     # Preload the right Python library
++     libpython = os.path.join(sysconfig.get_config_var('exec_prefix'), 'lib',
+++                             sysconfig.get_config_var('multiarchsubdir').lstrip('/'),
++                              sysconfig.get_config_var('INSTSONAME'))
++     env = dict(os.environ)
++     if sys.platform == 'macosx':
diff --git a/debian/patches/series b/debian/patches/series
index 27141da..5ee7044 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,5 @@ nauty-bin-rename.patch
 planarity-update.patch
 use-gsl-cblas.patch
 mpfi-fix-api.patch
+cysignals-multiarch-path.patch
 python_installs_in_userdir.patch

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