Update of /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22321
Modified Files:
macaulay2.info singular-factory.info singular-libfac.info
singular.info
Log Message:
further cleanup and doc
Index: singular-libfac.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/singular-libfac.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- singular-libfac.info 26 Jul 2004 16:50:58 -0000 1.2
+++ singular-libfac.info 26 Jul 2004 22:52:14 -0000 1.3
@@ -8,9 +8,13 @@
Source:
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/Singular-libfac-2-0-5.tar.gz
Source-MD5: 149cd0f1249388e58138a6b1de17dd7c
SourceDirectory: libfac
+## Only changes w.r.t. previous %v are _ besides those in srcs and deps etc _ that
+## 1) the patch is no longer relevant
+## 2) the vars ac_cv_c_const and ac_cv_c_inline from the previous patchscript no
longer appear in the build-dir
+## 3) NDEBUG is automatically set to 1 in present setting.
+## 4) the flags are set such as to coincide exactly with those in the corresponding
build in singular.info
+## 5) making sure that all flags referring to the build-dir come before any other
(foolproofing).
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
perl -pi.bak -e "s/\-O3/-mdynamic-no-pic -O3 -fschedule-insns -fschedule-insns2
-fsched-interblock -fstrict-aliasing -fregmove -freorder-blocks -floop-transpose
--param max-gcse-passes=3 -malign-natural -ffast-math -faltivec -mcpu=`machine|sed
's,ppc,,'` -mtune=`machine|sed 's,ppc,,'` -Wall -Wcast-align -W -Wno-unused/g"
configure.in
autoconf
<<
@@ -21,7 +25,7 @@
#!/bin/sh -v
export CPATH=%p/include
./configure %c
- make DEFS="-DNDEBUG=1 -DHAVE_SINGULAR_ERROR"
+ make DEFS=-DHAVE_SINGULAR_ERROR
<<
InstallScript: <<
make install prefix=%i
@@ -31,9 +35,7 @@
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]>
Index: macaulay2.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/macaulay2.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- macaulay2.info 26 Jul 2004 16:50:58 -0000 1.2
+++ macaulay2.info 26 Jul 2004 22:52:14 -0000 1.3
@@ -5,22 +5,32 @@
Source: http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%v-src.tar.gz
Source-MD5: f2181baccdb9bbe75c4f6ee61f782533
Depends: gdbm3-shlibs, gmp-shlibs (>= 4.1.2-11)
-BuildDepends: sed | ssed , gdbm3, gmp (>= 4.1.2-11), autoconf2.5, gc-static (>=
6.2-2), singular-factory (>= 2.05-1), singular-libfac (>= 2.05-1), ntl (>= 5.3.1-12) |
singular-sntl | singular-sntl-sta
+BuildDepends: gdbm3, gmp (>= 4.1.2-11), autoconf2.5, gc-static (>= 6.2-2),
singular-factory (>= 2.05-1), singular-libfac (>= 2.05-1), ntl (>= 5.3.1-12) |
singular-sntl | singular-sntl-sta
Suggests: emacs | xemacs
SourceDirectory: Macaulay2-%v
+## Diffs with previous %v _ besides dependencies (note also gdbm -> gdbm3) :
+## 1) the previous trouble with linking tmpl_inst.o [presumably ld didn't want to see
in a -lxyz.a an object
+## with the same name as one of the objects to be linked (flat_namespace spirit
?)] has disappeared _ don't
+## know with what %v of the dev-tools. So ref's to that trouble have been deleted,
and line 3 in the patchscript
+## is related too.
+## 2) make check added for the moment _ and the last line of the patchscript is to
let the build complete normally
+## despite the failure of make check at some point. [A diff with the log of the
prev %r (with the same ine added
+## in patchscript) shows the results of make check are identical in both cases _
but for the timings of course !]
+## 3) line 5 in the patchscript is to link with the additional deps (note: not only
ntl, but also cfmem)
+## 4) line 6 is to zap all -I/sw/include flags that preceded some flag referring to
the build-dir
+## 5) Finally line 4 : this was the only way I found to link correctly here. It seems
rather fragile (that's part of
+## the reason of the make check..) : eg, just adding NoSetLDFLAGS: true and
SetLIBRARY_PATH: %p/lib would
+## give there an executable that crashes ('Bus Error') at the first use ...
Apple's mysteries !
PatchScript: <<
sed "s|@PREFIX@|/sw|g" < %a/%n.patch | patch -p1
- mv Macaulay2/README.MacOSX Macaulay2/README.MacOSX.orig
- sed 's|/sw|%p|g' < Macaulay2/README.MacOSX.orig > Macaulay2/README.MacOSX
- sed -ri.bak '/libfac_tmpl_inst.o/d' Macaulay2/d/Makefile.in
- sed -ri 's,\(PURIFYCMD\) \$\(CC\),\(PURIFYCMD\) g++ -dynamic -m,'
Macaulay2/d/Makefile.in
- sed -ri 's,LIBRARYOPTIONS \+\= \-lgmp,LIBRARYOPTIONS \+\= \-lcfmem\nLIBRARYOPTIONS
\+\= \-lntl\n&,' Macaulay2/d/Makefile.in
- sed -ri.bak '/\$\(prefix\)\//d' include/config.Makefile.in
- sed -ri.bak 's,^clean check,check \:\:\n\t\$\(MAKE\) \-C ComputationsBook
changes\nclean,' Macaulay2/packages/Makefile.in
+ perl -pi -e 's|/sw|%p|g' Macaulay2/README.MacOSX
+ perl -pi.bak -e 's/^.*libfac_tmpl_inst\.o.*$//g' Macaulay2/d/Makefile.in
+ perl -pi -e 's,\(PURIFYCMD\) \$\(CC\),\(PURIFYCMD\) g++ -dynamic -m,'
Macaulay2/d/Makefile.in
+ perl -pi -e 's,LIBRARYOPTIONS \+\= \-lgmp,LIBRARYOPTIONS \+\=
\-lcfmem\nLIBRARYOPTIONS \+\= \-lntl\nLIBRARYOPTIONS \+\= \-lgmp,'
Macaulay2/d/Makefile.in
+ perl -pi.bak -e 's,^.*\$\(prefix\)\/.*$,,g' include/config.Makefile.in
+ perl -pi.bak -e 's,^clean check,check \:\:\n\t\$\(MAKE\) \-C ComputationsBook
changes\nclean,' Macaulay2/packages/Makefile.in
<<
-#NoSetLDFLAGS: true
NoSetCPPFLAGS: true
-#SetLIBRARY_PATH: %p/lib
ConfigureParams: --disable-strip --disable-dumpdata
CompileScript: <<
#!/bin/bash
Index: singular.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/singular.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- singular.info 24 Jul 2004 23:36:14 -0000 1.5
+++ singular.info 26 Jul 2004 22:52:14 -0000 1.6
@@ -11,7 +11,7 @@
Type: -sntl (boolean), -strio (boolean), -sta (boolean), -noopt (boolean)
Provides: %{ni}-variants
Conflicts: (%type_raw[-sntl] = -sntl) ntl, %{ni}-variants, singular-factory (<<
%v-1), singular-libfac (<< %v-1)
-Replaces: singular-factory (>= %v-1), singular-libfac (>= %v-1), %{ni}-variants
+Replaces: (%type_raw[-sntl] = -sntl) ntl, singular-factory (>= %v-1), singular-libfac
(>= %v-1), %{ni}-variants
Depends: (%type_raw[-sntl] = .) ntl, gmp-shlibs (>= 4.1.2-11), readline-shlibs
Recommends: mozilla, xemacs
BuildDepends: gmp (>= 4.1.2-11), autoconf, readline, netpbm-bin (>= 10.18-3),
latex2html, texinfo, tetex, sed | ssed
@@ -88,10 +88,10 @@
Description: CAS for commutative algebra, and singularities
DescUsage: <<
- "Singular -h" will tell how to invoke help from within Singular.
-This is very extensive. (It comes up by default trough Safari
-when DISPLAY is not set, through mozilla else _ with ESingular, ie
-the xemacs interface, it comes through info _ but in all cases
-the default can be reset.)
+This is very extensive. (It comes up by default trough your Finder's
+browser (eg, Safari) when DISPLAY is not set, through mozilla else _
+with ESingular, ie the xemacs interface, it comes through info _ but
+in all cases the default can be reset.)
- TSingular gives in xterm interface.
<<
DescPort: <<
@@ -107,8 +107,8 @@
- an annoying series of warnings came up with fink's latest texinfo when building the
doc.
- lots of clean-up
- the -noopt variant is a poor man's substitute (just sufficient for me up to now)
for the
- 'debug' and 'profile' variants which are implicit in the Makefiles. Would be nice
to get
- a handle on those in the infofile (additional switch ?) .
+ 'debug' variant in the Makefiles. Would be nice to get a handle on this in the
infofile
+ _ as well as on the 'profile' variant _ (additional switch ?) .
- get -strio working: so libfac and factory can better be used standalone; their tests
should then work _ and one would be able to re-generate the gftables.
- there might be a way to build with alternative memory-managers (say omalloc, old,
new, and none).
Index: singular-factory.info
===================================================================
RCS file:
/cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/singular-factory.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- singular-factory.info 26 Jul 2004 16:50:58 -0000 1.2
+++ singular-factory.info 26 Jul 2004 22:52:14 -0000 1.3
@@ -3,15 +3,19 @@
Revision: 1
GCC: 3.3
Depends: gmp-shlibs (>= 4.1.2-11), ntl (>= 5.3.1-12) | singular-sntl |
singular-sntl-sta
-BuildDepends: sed | ssed , gmp (>= 4.1.2-11), autoconf
+BuildDepends: gmp (>= 4.1.2-11), autoconf
Replaces: singular, singular-sta, singular-sntl
Source:
ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/Singular-factory-2-0-5.tar.gz
Source-MD5: ccb98926a93b0fc90711730790c56ac5
SourceDirectory: factory
+## Lines 2 and 3 in the PatchScript are to have exactly the same flags as in
singular.info
+## _ for maintainability, and for comparison.
+## Line 1, and the other changes here except for dependency changes, is to make sure
+## all -I flags referring to the builddir come before any other (foolproofing).
PatchScript: <<
- sed -ri.bak -e 's/\-I\$\(includedir\) //g' GNUmakefile.in
- sed -ri -e "s/\t\-w/\t -Wall -Wcast-align -W -Wno-unused/g" GNUmakefile.in
- sed -ri.bak -e "s/\-O2/-mdynamic-no-pic -O3 -fschedule-insns -fschedule-insns2
-fsched-interblock -fstrict-aliasing -fregmove -freorder-blocks -floop-transpose
--param max-gcse-passes=3 -malign-natural -ffast-math -faltivec -mcpu=`machine|sed
's,ppc,,'` -mtune=`machine|sed 's,ppc,,'`/g" configure.in
+ perl -pi.bak -e 's/\-I\$\(includedir\) //g' GNUmakefile.in
+ perl -pi -e "s/\t\-w/\t -Wall -Wcast-align -W -Wno-unused/g" GNUmakefile.in
+ perl -pi.bak -e "s/\-O2/-mdynamic-no-pic -O3 -fschedule-insns -fschedule-insns2
-fsched-interblock -fstrict-aliasing -fregmove -freorder-blocks -floop-transpose
--param max-gcse-passes=3 -malign-natural -ffast-math -faltivec -mcpu=`machine|sed
's,ppc,,'` -mtune=`machine|sed 's,ppc,,'`/g" configure.in
autoconf
<<
NoSetLDFLAGS: true
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
