From 5ef9a407b62e60a95a0b7f80af966f25f0ebb377 Mon Sep 17 00:00:00 2001 From: Markus Dittrich Date: Thu, 16 Mar 2006 17:31:28 +0000 Subject: [PATCH] Added patch to fix compile failure with gcc-4.1. This fixes bug #126159 Package-Manager: portage-2.1_pre6-r3 --- sci-mathematics/singular/ChangeLog | 7 +- sci-mathematics/singular/Manifest | 15 +++-- .../singular-3.0.1.2-gcc4.1-gentoo.patch | 66 +++++++++++++++++++ .../singular/singular-3.0.1.2.ebuild | 5 +- 4 files changed, 84 insertions(+), 9 deletions(-) create mode 100644 sci-mathematics/singular/files/singular-3.0.1.2-gcc4.1-gentoo.patch diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog index 5aa7f40edd8f..e4dd511383b1 100644 --- a/sci-mathematics/singular/ChangeLog +++ b/sci-mathematics/singular/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-mathematics/singular # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.10 2006/03/11 20:23:03 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.11 2006/03/16 17:31:27 markusle Exp $ + + 16 Mar 2006; Markus Dittrich + +files/singular-3.0.1.2-gcc4.1-gentoo.patch, singular-3.0.1.2.ebuild: + Added patch to fix compile failure with gcc-4.1. This fixes + bug #126159. 11 Mar 2006; Markus Dittrich singular-3.0.1.2.ebuild: diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest index 988f84a55655..a98d84641d4b 100644 --- a/sci-mathematics/singular/Manifest +++ b/sci-mathematics/singular/Manifest @@ -1,6 +1,6 @@ -MD5 03731b7b78f60593bfd83c2d26b9a1a8 ChangeLog 4590 -RMD160 02804a06b61fc5dcdca99f0d2b9a6b7afe03702b ChangeLog 4590 -SHA256 462f45269be2b55bcfedaff4c86f94018dd60c5e815ac21264ab701d51a79bd0 ChangeLog 4590 +MD5 616add9f505cca9c0409c6f50118ece5 ChangeLog 4794 +RMD160 6bb73287e3b2aded818b1e62e93cbea193a26c16 ChangeLog 4794 +SHA256 a94b68446feea0f783247847a51ee0bf678437bc03ec0b4084bc6105bbc74dcf ChangeLog 4794 MD5 673cd925126b07ea0e78cf91269b7d66 files/digest-singular-2.0.5-r4 859 RMD160 e8e8f57f50a91e84a4af63e3222011e9a696636f files/digest-singular-2.0.5-r4 859 SHA256 643ada8e366c859a02d6dec1bf58cc0510a3462c833a347fa4ab95cf5b6e91c1 files/digest-singular-2.0.5-r4 859 @@ -19,6 +19,9 @@ SHA256 7a9d3f16386705e761d359c251b5028964fcded71eef4f5576559b7c547badb3 files/si MD5 5b489be217e784298e549744b0b2a3fa files/singular-3.0.1-gentoo.diff 4566 RMD160 cbfcd5c402b753c9a09b6e2961f2eaecf56b573e files/singular-3.0.1-gentoo.diff 4566 SHA256 212be39ee18d42a20bdb57f4036746d6a8551456e89f168816ce557e054beac3 files/singular-3.0.1-gentoo.diff 4566 +MD5 5c2d1fb9acfaec5afb8fb7005262d1c4 files/singular-3.0.1.2-gcc4.1-gentoo.patch 2603 +RMD160 2b8ba6154bdd6e1a57f1093d966cb11874c05390 files/singular-3.0.1.2-gcc4.1-gentoo.patch 2603 +SHA256 748752eaddcbbcd181f50e497c8bdcb714f7a2f4434ddeacac679c6c0bc842e3 files/singular-3.0.1.2-gcc4.1-gentoo.patch 2603 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156 @@ -28,6 +31,6 @@ SHA256 8bde53cf79771c990cc0114f85720a769c5c585502136960284f948c396395bb singular MD5 cd39e5ab8e6b0bb7d73746b86607dfb4 singular-3.0.1.1.ebuild 2869 RMD160 39e95e631ac2328bfde4cba8ab2b696ad73169ed singular-3.0.1.1.ebuild 2869 SHA256 28779526fa856c762b921896bc49fd89c2f06e57fc29390dd4121d980d0024cc singular-3.0.1.1.ebuild 2869 -MD5 949bb7de0369cbf4741844e9eee0d9a2 singular-3.0.1.2.ebuild 3079 -RMD160 bbb24c3dea86f5ce8796b0ca477d82f3c180a2e1 singular-3.0.1.2.ebuild 3079 -SHA256 bebd82b0d506b69d86a824ef2e807db771dc2513e1f102e36b8cb1da15b230e4 singular-3.0.1.2.ebuild 3079 +MD5 340096d421aedcdbf2a3aaa70d0abe56 singular-3.0.1.2.ebuild 3129 +RMD160 4bcb5161443edd3baa170c390620c0c35717c724 singular-3.0.1.2.ebuild 3129 +SHA256 2715955bb9de3a32ee351e6356ac78ad4ed184663d7d782ae6d2a82491585d41 singular-3.0.1.2.ebuild 3129 diff --git a/sci-mathematics/singular/files/singular-3.0.1.2-gcc4.1-gentoo.patch b/sci-mathematics/singular/files/singular-3.0.1.2-gcc4.1-gentoo.patch new file mode 100644 index 000000000000..cc9f4eff4817 --- /dev/null +++ b/sci-mathematics/singular/files/singular-3.0.1.2-gcc4.1-gentoo.patch @@ -0,0 +1,66 @@ +diff -Naur Singular-3-0-1/factory/int_poly.cc Singular-3-0-1-new/factory/int_poly.cc +--- Singular-3-0-1/factory/int_poly.cc 2005-01-13 09:10:22.000000000 -0600 ++++ Singular-3-0-1-new/factory/int_poly.cc 2006-03-16 09:39:36.000000000 -0600 +@@ -559,6 +559,9 @@ + } + } + ++// forward declaration ++bool divremt ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm& ); ++ + + bool + InternalPoly::divremsamet( InternalCF* acoeff, InternalCF*& quot, InternalCF*& rem ) +diff -Naur Singular-3-0-1/factory/sm_sparsemod.cc Singular-3-0-1-new/factory/sm_sparsemod.cc +--- Singular-3-0-1/factory/sm_sparsemod.cc 2000-04-05 05:03:09.000000000 -0500 ++++ Singular-3-0-1-new/factory/sm_sparsemod.cc 2006-03-16 09:40:03.000000000 -0600 +@@ -30,6 +30,10 @@ + #include "ftmpl_array.h" + #include "ftmpl_functions.h" + ++// forward declaration ++Variable rootOf( const CanonicalForm &, char name); ++ ++ + static CanonicalForm + smodgcd( const CanonicalForm & u, const CanonicalForm & v, const CanonicalForm & lcggt, const REvaluation & alpha, CFRandom & gen, int CHAR, const Variable & extension ) + { +diff -Naur Singular-3-0-1/kernel/clapsing.cc Singular-3-0-1-new/kernel/clapsing.cc +--- Singular-3-0-1/kernel/clapsing.cc 2005-11-04 02:44:25.000000000 -0600 ++++ Singular-3-0-1-new/kernel/clapsing.cc 2006-03-16 10:25:54.000000000 -0600 +@@ -24,6 +24,9 @@ + #endif + #include "ring.h" + ++// forward declaration ++Variable rootOf( const CanonicalForm &, char name); ++ + // + // FACTORY_GCD_TEST: use new gcd instead of old one. Does not work + // without new gcd-implementation which is not publicly available. +diff -Naur Singular-3-0-1/libfac/charset/alg_factor.cc Singular-3-0-1-new/libfac/charset/alg_factor.cc +--- Singular-3-0-1/libfac/charset/alg_factor.cc 2005-10-17 08:16:18.000000000 -0500 ++++ Singular-3-0-1-new/libfac/charset/alg_factor.cc 2006-03-16 10:08:11.000000000 -0600 +@@ -21,6 +21,9 @@ + + void out_cf(char *s1,const CanonicalForm &f,char *s2); + ++// forward declaration ++Variable rootOf( const CanonicalForm &, char name); ++ + #ifdef ALGFACTORDEBUG + # define DEBUGOUTPUT + #else +diff -Naur Singular-3-0-1/libfac/factor/Factor.cc Singular-3-0-1-new/libfac/factor/Factor.cc +--- Singular-3-0-1/libfac/factor/Factor.cc 2005-12-12 12:02:03.000000000 -0600 ++++ Singular-3-0-1-new/libfac/factor/Factor.cc 2006-03-16 10:07:37.000000000 -0600 +@@ -47,6 +47,9 @@ + + void out_cf(char *s1,const CanonicalForm &f,char *s2); + ++// forward declaration ++Variable rootOf( const CanonicalForm &, char name); ++ + /* + * a wrapper for factorize over algebraic extensions: + * does a sanity check and, if nec., a conversion diff --git a/sci-mathematics/singular/singular-3.0.1.2.ebuild b/sci-mathematics/singular/singular-3.0.1.2.ebuild index 4ab553fda539..71a71a366377 100644 --- a/sci-mathematics/singular/singular-3.0.1.2.ebuild +++ b/sci-mathematics/singular/singular-3.0.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.1.2.ebuild,v 1.4 2006/03/11 20:23:03 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.1.2.ebuild,v 1.5 2006/03/16 17:31:27 markusle Exp $ inherit eutils flag-o-matic @@ -29,7 +29,8 @@ S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR} src_unpack () { unpack ${A} - epatch $FILESDIR/${PN}-${PV_MAJOR}-gentoo.diff + epatch "${FILESDIR}"/${PN}-${PV_MAJOR}-gentoo.diff + epatch "${FILESDIR}"/${P}-gcc4.1-gentoo.patch sed -e "s/PFSUBST/${PF}/" -i ${S}/kernel/feResource.cc || \ die "sed failed on feResource.cc" } -- 2.26.2