[sagemath] 01/01: Filter out optimisation flags

[Ximin Luo]

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

infinity0 pushed a commit to branch _experiment_no-opt
in repository sagemath.

commit 8c18df8959ed4fba2cebcd3b25daa5a4794427f2
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Aug 9 04:23:35 2016 +0200

    Filter out optimisation flags
    
    Hopefully this should fix our "illegal instruction" errors
---
 debian/patches/debian-no-optimisation.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/debian-no-optimisation.patch b/debian/patches/debian-no-optimisation.patch
new file mode 100644
index 0000000..4c8a3ef
--- /dev/null
+++ b/debian/patches/debian-no-optimisation.patch
@@ -0,0 +1,26 @@
+Description: Filter out optimisation flags from various modules
+ Debian binaries must work on machines without these optimisations
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sage/src/module_list.py
++++ b/sage/src/module_list.py
+@@ -30,7 +30,7 @@
+ fflas_ffpack_pc = pkgconfig.parse('fflas-ffpack')
+ fflas_ffpack_libs = list(fflas_ffpack_pc['libraries'])
+ fflas_ffpack_library_dirs = list(fflas_ffpack_pc['library_dirs'])
+-fflas_ffpack_cflags = pkgconfig.cflags('fflas-ffpack').split()
++fflas_ffpack_cflags = filter(lambda x: not x.startswith("-m"), pkgconfig.cflags('fflas-ffpack').split())
+ 
+ # Givaro
+ givaro_pc = pkgconfig.parse('givaro')
+@@ -102,7 +102,7 @@
+ m4ri_library_dirs = list(m4ri_pc['library_dirs'])
+ m4ri_include_dirs = list(m4ri_pc['include_dirs'])
+ 
+-m4ri_extra_compile_args = pkgconfig.cflags('m4ri').split()
++m4ri_extra_compile_args = filter(lambda x: not x.startswith("-m"), pkgconfig.cflags('m4ri').split())
+ try:
+     m4ri_extra_compile_args.remove("-pedantic")
+ except ValueError:
diff --git a/debian/patches/series b/debian/patches/series
index 107c255..d804c9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,3 +37,4 @@ debian-temp-userdir-singular.patch
 debian-temp-userdir.patch
 temp-disable-parallel-sphinx.patch
 temp-cython-include-source.patch
+debian-no-optimisation.patch

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