Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1:/tmp/cvs-serv4165
Added Files:
singular-factory-1.3b-7.info singular-factory-1.3b-7.patch
singular-libfac-0.3.2-5.info singular-libfac-0.3.2-5.patch
Log Message:
back to gcc3
--- NEW FILE: singular-factory-1.3b-7.info ---
Package: singular-factory
Version: 1.3b
Revision: 7
Depends: gmp-shlibs
BuildDepends: gmp
#Source:
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/Singular-factory-2.0.1.tar.gz
Source: http://www.math.uiuc.edu/Macaulay2/ftp-site/factory-%v.20010625.tgz
SourceRename: Singular-factory-2.0.1.tar.gz
Source-MD5: 893adc69b64ea9b527651d3726be82b8
SourceDirectory: factory
Patch: %f.patch
ConfigureParams: --disable-streamio
DocFiles: COPYING ChangeLog INSTALL NEWS README
License: GPL
Description: Recursive representation of multivariate polynomials in C++
DescPort: <<
Had trouble compiling ftmpl_inst.cc, so tried adding
--disable-streamio, but then make gftables doesn't work at all.
The patch removing extern "C" is needed for gmp 4.0.
<<
Homepage: http://www.singular.uni-kl.de/
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
--- NEW FILE: singular-factory-1.3b-7.patch ---
diff -ur factory/cf_gmp.h factory-patched/cf_gmp.h
--- factory/cf_gmp.h Mon Jun 25 03:51:46 2001
+++ factory-patched/cf_gmp.h Sun Jan 13 16:29:33 2002
@@ -6,8 +6,6 @@
#include <config.h>
-extern "C" {
#include <gmp.h>
-}
#endif /* ! INCL_CF_GMP_H */
--- NEW FILE: singular-libfac-0.3.2-5.info ---
Package: singular-libfac
Version: 0.3.2
Revision: 5
BuildDepends: gmp
Depends: singular-factory (>= 1.3b-7)
#Source: ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-%v.tar.gz
Source: http://www.math.uiuc.edu/Macaulay2/ftp-site/libfac-%v.20010628.tar.gz
SourceRename: libfac-%v.tar.gz
Source-MD5: 4ec3988168916f415240a347b8dfb2a4
SourceDirectory: libfac
Patch: %f.patch
PatchScript: <<
echo "ac_cv_c_const=${ac_cv_c_const=yes}" >config.cache
echo "ac_cv_c_inline=${ac_cv_c_inline=yes}" >>config.cache
<<
CompileScript: <<
./configure %c
make DEFS=-DHAVE_SINGULAR_ERROR
<<
InstallScript: <<
make install prefix=%i
ranlib %i/lib/libfac.a
<<
DocFiles: 00README COPYING ChangeLog
License: GPL
Description: Library for factorization of polynomials over finite fields
DescPort: <<
patchfile from the authors of Macaulay2 (thanks!)
also tried SetCFLAGS -no-cpp-precomp and SetCXXFLAGS -O2
another variant: make DEFS="-DNDEBUG=1 -DHAVE_SINGULAR_ERROR"
<<
Homepage: http://www.singular.uni-kl.de/
Maintainer: Dave Morrison <[EMAIL PROTECTED]>
--- NEW FILE: singular-libfac-0.3.2-5.patch ---
diff -ur libfac/factor/Factor.cc libfac-0.3.2.20010628.2/factor/Factor.cc
--- libfac/factor/Factor.cc Thu Jun 28 11:27:06 2001
+++ libfac-0.3.2.20010628.2/factor/Factor.cc Tue Aug 7 19:24:41 2001
@@ -24,6 +24,10 @@
extern void WarnS(const char *);
#endif
+#ifdef HAVE_SINGULAR_ERROR
+ extern "C" { void WerrorS(char *), WarnS(char *); }
+#endif
+
#ifdef FACTORDEBUG
# define DEBUGOUTPUT
#else
@@ -214,7 +218,7 @@
Returnlist.append(CFFactor(numerator/test ,1));
}
else {
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WerrorS("libfac: ERROR: not_monic1: case lt is a sum.");
#else
cerr << "libfac: ERROR: not_monic1: case lt is a sum.\n"
@@ -231,7 +235,7 @@
// the following will do what we want
Returnlist= myUnion( CFFList(CFFactor(1/a,1)),Returnlist) ;
else {
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WerrorS("libfac: ERROR: not_monic2: case lt is a sum.");
#else
cerr << "libfac: ERROR: not_monic2: case lt is a sum.\n"
@@ -320,7 +324,7 @@
else {
if ( degree(Extension) == 0 ) FFRandom gen;
else {
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WerrorS("libfac: evaluate: Extension not inFF() or inGF() !");
#else
cerr << "libfac: evaluate: " << Extension << " not inFF() or inGF() !"
@@ -391,7 +395,7 @@
ok= try_specializePoly(f,minpoly,deg,Substitutionlist,i,j);
}
else {
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WerrorS("libfac: spezializePoly ERROR: Working over given extension-field not
yet implemented!");
#else
cerr << "libfac: spezializePoly ERROR: Working over given extension-field not
yet implemented!\n"
@@ -425,7 +429,7 @@
if ( degree(Extension) >0 ) GFRandom gen;
else { if ( degree(Extension) == 0 ) FFRandom gen;
else {
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WerrorS("libfac: evaluate: Extension not inFF() or inGF() !");
#else
cerr << "libfac: evaluate: " << Extension << " not inFF() or inGF() !"
@@ -613,7 +617,7 @@
success=
specializePoly(ffuni,Extension,degree(ff),Substitutionlist,1,getNumVars(compress(ff,m)));
DEBOUTLN(cout, "Returned from specializePoly: success: ", success);
if (success == 0 ){ // No spezialisation could be found
-#ifdef SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WarnS("libfac: Factorize: ERROR: Not able to find a valid specialization!");
#else
cerr << "libfac: Factorize: ERROR: Not able to find a valid specialization!\n"
diff -ur libfac/factor/MVMultiHensel.cc libfac-0.3.2.20010628.2/factor/MVMultiHensel.cc
--- libfac/factor/MVMultiHensel.cc Thu Jun 28 11:27:06 2001
+++ libfac-0.3.2.20010628.2/factor/MVMultiHensel.cc Tue Aug 7 19:22:49 2001
@@ -16,6 +16,10 @@
extern "C" { void WerrorS(char *); }
#endif
+#ifdef HAVE_SINGULAR_ERROR
+ extern "C" { void WerrorS(char *); }
+#endif
+
#ifdef HENSELDEBUG
# define DEBUGOUTPUT
#else
@@ -105,7 +109,7 @@
// Degrees ok? degree(F1,mainvar) + degree(F2,mainvar) <= i ?
if ( (degree(F1,levelU) + degree(F2,levelU) ) <= i ) {
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WerrorS("libfac: diophant ERROR: degree too large! ");
#else
cerr << "libfac: diophant ERROR: degree too large! "
@@ -119,7 +123,7 @@
r=extgcd(F1,F2,s,t);
// check if gcd(F1,F2) <> 1 , i.e. F1 and F2 are not relatively prime
if ( ! r.isOne() ){
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WerrorS("libfac: diophant ERROR: F1 and F2 are not relatively prime! ");
#else
cerr << "libfac: diophant ERROR: " << F1 << " and " << F2
diff -ur libfac/factor/SqrFree.cc libfac-0.3.2.20010628.2/factor/SqrFree.cc
--- libfac/factor/SqrFree.cc Thu Jun 28 11:27:06 2001
+++ libfac-0.3.2.20010628.2/factor/SqrFree.cc Tue Aug 7 19:22:49 2001
@@ -17,6 +17,10 @@
extern "C" { void WerrorS(char *); }
#endif
+#ifdef HAVE_SINGULAR_ERROR
+ extern "C" { void WerrorS(char *); }
+#endif
+
#ifdef SQRFREEDEBUG
# define DEBUGOUTPUT
#else
@@ -124,7 +128,7 @@
if ( g.isOne() || (-g).isOne() || (g==f) || (getNumVars(g)==0) ) return 1 ;
else return 0 ;
}
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WerrorS("libfac: ERROR: SqrFreeTest: we should never fall trough here!");
#else
cerr << "\nlibfac: ERROR: SqrFreeTest: we should never fall trough here!\n"
@@ -250,7 +254,7 @@
DEBDECLEVEL(cout, "SqrFreed");
return Outputlist ;
}
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WerrorS("libfac: ERROR: SqrFreed: we should never fall trough here!");
#else
cerr << "\nlibfac: ERROR: SqrFreed: we should never fall trough here!\n"
diff -ur libfac/factor/Truefactor.cc libfac-0.3.2.20010628.2/factor/Truefactor.cc
--- libfac/factor/Truefactor.cc Thu Jun 28 11:27:06 2001
+++ libfac-0.3.2.20010628.2/factor/Truefactor.cc Tue Aug 7 19:25:16 2001
@@ -16,6 +16,10 @@
extern "C" { void WerrorS(char *); }
#endif
+#ifdef HAVE_SINGULAR_ERROR
+ extern "C" { void WerrorS(char *); }
+#endif
+
#ifdef TRUEFACTORDEBUG
# define DEBUGOUTPUT
#else
@@ -352,7 +356,7 @@
if ( PossibleFactors.length() > 0 ){ // there are (at least two) items
int n=2;
if ( PossibleFactors.length() < n ) { // a little check
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WerrorS("libfac: ERROR: TakeNorms less then two items remaining!");
#else
cerr << "libfac: ERROR: TakeNorms less then two items remaining! "
@@ -394,7 +398,7 @@
TrueFactors.append(CFFactor(intermediate,1));
}
else{
-#ifdef HAVE_SINGULAR
+#ifdef HAVE_SINGULAR_ERROR
WerrorS("libfac: TakeNorms: somethings wrong with remaining factors!");
#else
cerr << "libfac: TakeNorms: somethings wrong with remaining factors!"
diff -ur libfac/factor/tmpl_inst.cc libfac-0.3.2.20010628.2/factor/tmpl_inst.cc
--- libfac/factor/tmpl_inst.cc Thu Jun 28 11:27:06 2001
+++ libfac-0.3.2.20010628.2/factor/tmpl_inst.cc Tue Aug 7 19:16:30 2001
@@ -24,12 +24,14 @@
template class Matrix<CanonicalForm>;
template class SubMatrix<CanonicalForm>;
+#ifndef NOSTREAMIO
template ostream & operator << ( ostream &, const List<CanonicalForm> & );
template ostream & operator << ( ostream &, const List<CFFactor> & );
template ostream & operator << ( ostream &, const List<MapPair> & );
template ostream & operator << ( ostream &, const Array<CanonicalForm> & );
template ostream & operator << ( ostream &, const Factor<CanonicalForm> & );
//template ostream & operator << ( ostream &, const Matrix<CanonicalForm> & );
+#endif
template List<CFFactor> Union ( const List<CFFactor>&, const List<CFFactor>& );
@@ -61,8 +63,10 @@
template List<CanonicalForm> Union ( const List<CanonicalForm>&, const
List<CanonicalForm>& );
template List<CanonicalForm> Difference ( const List<CanonicalForm>&, const
List<CanonicalForm>& );
+#ifndef NOSTREAMIO
template ostream & operator << ( ostream &, const List<int> & );
template ostream & operator << ( ostream &, const List<IntList> & );
+#endif
// for charsets:
template class List<CFList>;
@@ -73,10 +77,12 @@
template List<Variable> Union ( const List<Variable>&, const List<Variable>& );
template List<Variable> Difference ( const List<Variable>&, const List<Variable>& );
+#ifndef NOSTREAMIO
template ostream & operator << ( ostream &, const List<CFList> & );
template ostream & operator << ( ostream &, const List<Variable> & );
template ostream & operator << ( ostream &, const List<int> & );
template ostream & operator << ( ostream &, const Array<int> & );
+#endif
template class Array<int>;
template class Array<Variable>;
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
