[singular] 04/04: Build against GCC 6, applying a Sage patch to make that work

[Ximin Luo]

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

infinity0 pushed a commit to branch master3-sage
in repository singular.

commit 04d031c248f5d77624c4cc98c00063f17bcb73e7
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sat Oct 8 01:02:56 2016 +0200

    Build against GCC 6, applying a Sage patch to make that work
---
 debian/changelog                   |  7 +++++++
 debian/patches/series              |  2 ++
 debian/patches/singular-gcc6.patch | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 153f3b1..72bf417 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+singular (3.1.7p1+ds-0+sage2) UNRELEASED; urgency=medium
+
+  * Rebuild using GCC 6.
+  * Build against flint, needed for SageMath.
+
+ -- Ximin Luo <infinity0 at debian.org>  Sat, 08 Oct 2016 00:52:33 +0200
+
 singular (3.1.7p1+ds-0+sage1) unstable-sage; urgency=medium
 
   * New upstream version (from sage).
diff --git a/debian/patches/series b/debian/patches/series
index 92bfb0c..a23e04a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,7 @@ Minor.h.patch
 remove_warning.patch
 sanitize_gmp_header_hack.patch
 singular-3.1.7-use_cxx_for_linking.patch
+singular-gcc6.patch
 singular_ntl.patch
 sing_win.patch
 slibdir.patch
@@ -14,3 +15,4 @@ stricmp.patch
 templates.patch
 fix-headers.patch
 flint-libs.patch
+fix-configure-flint-detection.patch
diff --git a/debian/patches/singular-gcc6.patch b/debian/patches/singular-gcc6.patch
new file mode 100644
index 0000000..7c1d252
--- /dev/null
+++ b/debian/patches/singular-gcc6.patch
@@ -0,0 +1,32 @@
+diff -up a/latest/kernel/mod_raw.cc b/latest/kernel/mod_raw.cc
+--- latest/kernel/mod_raw.cc	2014-08-06 09:59:15.000000000 -0600
++++ latest/kernel/mod_raw.cc	2016-02-15 21:53:02.950149126 -0700
+@@ -38,8 +38,8 @@ char* si_bultin_libs[]={ SI_FOREACH_BUIL
+ 
+ lib_types type_of_LIB(char *newlib, char *libnamebuf)
+ {
+-  const char mach_o[]={0xfe,0xed,0xfa,0xce,0};
+-  const char mach_o_module[]={0xce,0xfa,0xed,0xfe,0};
++  const unsigned char mach_o[]={0xfe,0xed,0xfa,0xce,0};
++  const unsigned char mach_o_module[]={0xce,0xfa,0xed,0xfe,0};
+   int i=0;
+   while(si_bultin_libs[i]!=NULL)
+   {
+@@ -90,7 +90,7 @@ lib_types type_of_LIB(char *newlib, char
+     goto lib_type_end;
+   }
+ 
+-  if( (strncmp(buf, &mach_o[0], 4)==0)) /* generic Mach-O module */
++  if( (strncmp(buf, (const char *)mach_o, 4)==0)) /* generic Mach-O module */
+   {
+     LT = LT_MACH_O;
+     //omFree(newlib);
+@@ -98,7 +98,7 @@ lib_types type_of_LIB(char *newlib, char
+     goto lib_type_end;
+   }
+ 
+-  if( (strncmp(buf, &mach_o_module[0], 4)==0)) /* Mach-O bundle */
++  if( (strncmp(buf, (const char *)mach_o_module, 4)==0)) /* Mach-O bundle */
+   {
+     LT = LT_MACH_O;
+     //omFree(newlib);

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