Date: Thursday, May 12, 2016 @ 14:27:44 Author: arojas Revision: 174991
NTL 9.8.1 rebuild Added: singular/trunk/singular-gcc6.patch Modified: singular/trunk/PKGBUILD ---------------------+ PKGBUILD | 12 ++++++++---- singular-gcc6.patch | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-12 12:19:29 UTC (rev 174990) +++ PKGBUILD 2016-05-12 12:27:44 UTC (rev 174991) @@ -5,7 +5,7 @@ pkgname=singular pkgver=3.1.7.p1 _majver=3-1-7 -pkgrel=18 +pkgrel=19 pkgdesc="Computer Algebra System for polynomial computations" arch=(i686 x86_64) url="http://www.singular.uni-kl.de/"; @@ -13,14 +13,16 @@ depends=(flint cddlib) # polymake options=(!buildflags) source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/src/$_majver/Singular-${_majver}p1.tar.gz"; -"http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/src/$_majver/Singular-${_majver}-share.tar.gz"; 'templates.patch' 'ntl8.patch' -"http://git.sagemath.org/sage.git/plain/build/pkgs/singular/patches/currring.patch"; 'fix-include-dirs.patch') + "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/src/$_majver/Singular-${_majver}-share.tar.gz"; + 'templates.patch' 'ntl8.patch' "http://git.sagemath.org/sage.git/plain/build/pkgs/singular/patches/currring.patch"; + 'fix-include-dirs.patch' 'singular-gcc6.patch') md5sums=('ce369519d1c5d07342722e78240ea044' 'b9177c00e95ee21b137984bade9fc481' '8ca8ba06c846a8de189fff322d557705' '2c028bbda467b437d5598ac07cd7211f' '1fe968092b5e98878cd9b47c7d9acc81' - '31bdcc87548dd1fdc2cf5a73545b4f2d') + '31bdcc87548dd1fdc2cf5a73545b4f2d' + '36bb2a3fa574275215464f835dd16e05') prepare() { cd Singular-$_majver @@ -33,6 +35,8 @@ patch -p1 -i ../currring.patch # fix factory include dir patch -p1 -i ../fix-include-dirs.patch +# fix build with GCC 6 (Fedora) + patch -p1 -i ../singular-gcc6.patch } build() { Added: singular-gcc6.patch =================================================================== --- singular-gcc6.patch (rev 0) +++ singular-gcc6.patch 2016-05-12 12:27:44 UTC (rev 174991) @@ -0,0 +1,32 @@ +diff -up Singular-3-1-7/kernel/mod_raw.cc.orig Singular-3-1-7/kernel/mod_raw.cc +--- Singular-3-1-7/kernel/mod_raw.cc.orig 2014-08-06 09:59:15.000000000 -0600 ++++ Singular-3-1-7/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[0], 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[0], 4)==0)) /* Mach-O bundle */ + { + LT = LT_MACH_O; + //omFree(newlib);
