Update of /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3022
Modified Files:
saclib.info qepcad.info
Removed Files:
saclib.patch
Log Message:
cleanup
Index: qepcad.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/qepcad.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qepcad.info 11 Nov 2008 16:29:39 -0000 1.5
+++ qepcad.info 13 Nov 2008 20:04:44 -0000 1.6
@@ -1,42 +1,35 @@
Info2: <<
-Package: qepcad%type_pkg[d]%type_pkg[-gcc4.3]
+Package: qepcad%type_pkg[-gcc4.3]
Version: 1.50
-Revision: 1
+Revision: 2
#Source: http://www.cs.usna.edu/~qepcad/INSTALL/%{Ni}-B.%v.tar.gz
Source: http://www.cs.usna.edu/~wcbrown/qesource.tar.gz
Source-MD5: 517f5a8c49a8a89ecbae37897288f522
SourceDirectory: qesource
-Type: d (boolean), -gcc4.3 (boolean)
-# type d for debug version
-BuildDepends: freeglut, readline5, saclib%type_pkg[d]%type_pkg[-gcc4.3], sed
+Type: -gcc4.3 (boolean)
+BuildDepends: freeglut, readline5, saclib%type_pkg[-gcc4.3], sed
Depends: freeglut-shlibs, readline5-shlibs, singular
-Conflicts: %{Ni}, %{Ni}d, %{Ni}-gcc43, %{Ni}d-gcc43
-Replaces: %{Ni}, %{Ni}d, %{Ni}-gcc43, %{Ni}d-gcc43
+Conflicts: %{Ni}, %{Ni}-gcc43
+Replaces: %{Ni}, %{Ni}-gcc43
PatchScript: <<
#!/bin/sh -ev
find . -name '*.o' -exec rm -f \{\} \;
if [ "%type_raw[-gcc4.3]" == "-gcc4.3" ] ; then nopic=''; else
nopic="-mdynamic-no-pic"; fi
-# to strip binaries :
+# to strip binaries ( using "-s" would lead at launch to dyld error "lazy
pointer not found" ):
echo '__mh_execute_header' > symlst
-if [ "%type_pkg[d]" == "d" ]
- then sed -i'' -e "s,O4,g $nopic -Wall," {.,cad2d,plot2d,source}/Makefile
extensions/adj2d/new_make
- else
- # using "-s" would lead at launch to dyld error "lazy pointer not found"
- sed -i'' -e 's;(EXE)\|(LIBS);& -Wl,-x -exported_symbols_list %b/symlst
-dead_strip;' \
- {cad2d,plot2d,source}/Makefile
- sed -i'' -e "s,O4,O3 -fstrict-aliasing $nopic -Wall," \
- {.,cad2d,plot2d,source}/Makefile extensions/adj2d/new_make
-fi
+sed -i'' -e 's;(EXE)\|(LIBS);& -Wl,-x -exported_symbols_list %b/symlst
-dead_strip;' \
+ -e "s,O4,O3 -fstrict-aliasing $nopic -Wall," \
+ -e "s,= *-g,& $nopic -Wall -DNO_SACLIB_MACROS ," \
+ {.,cad2d,plot2d,source}/Makefile extensions/adj2d/new_make
sed -i'' -e 's,gmake,make,' Makefile
-sed -i'' -e 's,saclibo,saclib,' -e 's,-lreadline,-L%p/lib &,'
{cad2d,source}/Makefile
+sed -i'' -e 's,-lreadline,-L%p/lib &,' {cad2d,source}/Makefile
sed -i'' -e '/^GLBASE/s,/usr,&/X11R6,' -e '/^GLUTBASE/s,/usr,%p,'
plot2d/Makefile
sed -i'' -e 's,/bin/ADJ2D_plot,%p&,' extensions/rend/PLOT_2D_CAD.cc
-sed -i'' -e 's,qepath [+],string("%p/share/%{Ni}") +,'
{cad2d/src,source/main}/MAIN.c
+sed -i'' -e 's,qepath [+],string("%p/etc") +,' -e
's,default.qepcadrc,qepcadrc,' {cad2d/src,source/main}/MAIN.c
sed -i'' -e 's,qepcad.help,%p/share/%{Ni}/&,' -e 's,/bin/%p,,'
source/userint/HELPFRD.c
sed -i'' -e 's,getenv("qe"),"%p",' {cad2d/src,source/main}/MAIN.c
extensions/rend/PLOT_2D_CAD.cc source/userint/HELPFRD.c
-sed -i'' -e '$a\
-SINGULAR %p/bin' default.qepcadrc
+sed -e 's,^#S,S,' -e 's,/usr,%p,' < default.qepcadrc > qepcadrc
## gcc43 requires the following (first for srtcpy, second and third for
memmove):
sed -i'' -e 's,#include <string>,#include <cstring>\n&,'
extensions/rend/PLOT_2D_CAD.cc source/db/convenientstreams.h
sed -i'' -e 's,#include <cstdlib>,#include <cstring>\n&,'
source/db/unnamedpipe.h
@@ -46,19 +39,21 @@
if [ "%type_raw[-gcc4.3]" == "-gcc4.3" ] ; then export
PATH=%p/lib/gcc4.3/bin:$PATH CC=gcc; fi
export saclib=%p
export qe=`pwd`
-make opt
-cd cad2d; make opt; cd -
+make both
+cd cad2d; make both; cd -
cd plot2d; make; cd -
<<
InstallScript: <<
-mkdir -p %i/include/%{Ni} %i/lib/%{Ni} %i/bin %i/share/%{Ni}
+mkdir -p %i/include/%{Ni} %i/lib/%{Ni} %i/bin %i/share/%{Ni} %i/etc
cp -p --parents `find . -name '*.h'` %i/include/%{Ni}
cp -p `find . -name '*.a'` %i/lib/%{Ni}
ranlib %i/lib/%{Ni}/*.a
-cp -p source/%{Ni} cad2d/cad2d plot2d/ADJ2D_plot %i/bin
-cp -p default.qepcadrc source/qepcad.help %i/share/%{Ni}
+cp -p source/%{Ni}{,d} cad2d/cad2d{,d} plot2d/ADJ2D_plot %i/bin
+cp -p source/qepcad.help %i/share/%{Ni}
+cp -p qepcadrc %i/etc
chmod -R a+rX %i
<<
+ConfFiles: %p/etc/qepcadrc
DocFiles: LICENSE LOG README TODO
Description: Tarski's Quantifier Elimination
License: OSI-Approved
--- saclib.patch DELETED ---
Index: saclib.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/saclib.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- saclib.info 11 Nov 2008 16:29:39 -0000 1.9
+++ saclib.info 13 Nov 2008 20:04:44 -0000 1.10
@@ -1,56 +1,45 @@
Info2: <<
-Package: saclib%type_pkg[d]%type_pkg[-gcc4.3]
+Package: saclib%type_pkg[-gcc4.3]
Version: 2.2.0
-Revision: 1
+Revision: 2
#Source: http://www.cs.usna.edu/~qepcad/INSTALL/%{Ni}%v.tar.gz
Source: http://www.cs.usna.edu/~wcbrown/%{Ni}%v.tar.gz
Source-MD5: 6fd2489018a0d163338a9dcd42f72e48
-Type: d (boolean), -gcc4.3 (boolean)
-# type d for debug version
-Conflicts: %{Ni}, %{Ni}d, %{Ni}-gcc43, %{Ni}d-gcc43
-Replaces: %{Ni}, %{Ni}d, %{Ni}-gcc43, %{Ni}d-gcc43
+Type: -gcc4.3 (boolean)
+Conflicts: %{Ni}, %{Ni}-gcc43
+Replaces: %{Ni}, %{Ni}-gcc43
PatchScript: <<
#!/bin/sh -ev
- rm -fR RCS
- sed -e '/Get architecture type/,/else/s,else,elsif ($uname =~
/Power|powerpc/)\n{\n\t$ptype = "ppc";\n}\n&,' \
+rm -fR RCS
+echo "#ifdef __LITTLE_ENDIAN__
+#ifndef _LITTLE_ENDIAN_
+#define _LITTLE_ENDIAN_
+#endif
+#undef _BIG_ENDIAN_
+#endif
+#ifdef __BIG_ENDIAN__
+#ifndef _BIG_ENDIAN_
+#define _BIG_ENDIAN_
+#endif
+#undef _LITTLE_ENDIAN_
+#endif" > sysdep/linuxX86/sysdep.h
+sed -i'' -e '/Get architecture type/,/else/s,else,elsif ($uname =~
/Power|powerpc/)\n{\n\t$ptype = "ppc";\n}\n&,' \
-e '/Get OS type/,/else/s,else,elsif ($uname =~ /Darwin/)\n{\n\t$ostype
= "darwin";\n}\n&,' \
- -e '/Create sysdep.h$/a\
- $Endian = "/* Created by $saclib/bin/mksysdep.pl */\
-#ifdef __LITTLE_ENDIAN__\
-#define _LITTLE_ENDIAN_\
-#endif\
-#ifdef __BIG_ENDIAN__\
-#define _BIG_ENDIAN_\
-#endif\
-";' \
- -e '$i \
-elsif ($ostype eq "darwin")\
-{\
- print SYSDEP $Endian;\
- system("bash -c \\"pushd >/dev/null $ENV{X%{Ni}X}/sysdep/darwin ;
./install %b ; popd >/dev/null\\"");\
-}' < %a/%{Ni}.patch | sed -e "s,X%{Ni}X,'%{Ni}'," > bin/mksysdep.pl
-## %a/%{Ni}.patch is the file "bin/mksysdep.pl~" from the official distribution
- cp -pPR sysdep/archive/generic sysdep/darwin
- cp -p sysdep/linuxX86/GC.c sysdep/darwin/src
- rm sysdep/darwin/src/FAIL_varargs.c
- sed -i'' -e 's,generic,darwin,' sysdep/darwin/install
- add_def="`grep -e BETA2 -e 'define LARGE' -e 'define SMALL' -e
'N[MLS]PRIME_' include/sacsys.h~|sed -e 's,$,\\\,'`"
- sed -i'' -e "/BETA1/a\
-$add_def
-" sysdep/darwin/include/sacsys.h
+ -e '/^ *elsif .*x86.*linux/{
+ s,[(],((,
+ s,[)]$,) || $ostype eq "darwin"),
+ }' bin/mksysdep.pl
sed -i'' -e '/<malloc\.h>/c\
#ifndef __APPLE__\
#include <malloc.h>\
#endif' src/IQR.c
if [ "%type_raw[-gcc4.3]" == "-gcc4.3" ] ; then nopic=''; else
nopic="-mdynamic-no-pic"; fi
- if [ "%type_pkg[d]" == "d" ]
- then sed -i'' -e "s,SACFLAG= ,\"SACFLAG=-g $nopic -Wall
-DNO_SACLIB_MACROS\" ," sysdep/darwin/bin/mklib
- else
- ## avoid "...will break strict-aliasing rules" warnings:
- sed -i'' -e 's;%{Ni}/lib/obj$;&\nmake CC=$CC "SACFLAG=-O3 $nopic -Wall"
EXTENSION= MMAPFS.o MMPDDF.o MMPFBL.o;' \
- -e 's,SACFLAG= ,"SACFLAG=-O3 -fstrict-aliasing $nopic -Wall"
,' sysdep/darwin/bin/mklib
- fi
+ ## first line next is to avoid "...will break strict-aliasing rules"
warnings:
+ sed -i'' \
+ -e "/Compiling/,\$s,%{Ni}/lib/objo$,&\n make CC=\$CC \"SACFLAG=-O3\"
EXTENSION=o MMAPFS.o MMPDDF.o MMPFBL.o," \
+ -e 's,\(SACFLAG=\)",\1-O3 -fstrict-aliasing",' \
+ -e "s,SACFLAG=,&$nopic -Wall ," bin/mklib
sed -i'' -e '/_X86_LINUX_/c\
#if defined (_X86_LINUX_) || defined (__APPLE__)' \
-e '/ieee754\.h/c\
@@ -67,23 +56,20 @@
#!/bin/sh -ev
if [ "%type_raw[-gcc4.3]" == "-gcc4.3" ]; then export
PATH=%p/lib/gcc4.3/bin:$PATH CC=gcc; fi
export %{Ni}=%b
- mkdir -p lib/obj
- cd bin; ./sconf
+ bin/sconf; bin/mkproto; bin/mkmake; bin/mklib all
<<
InstallScript: <<
#!/bin/sh -ev
mkdir -p %i/bin %i/lib %i/include %i/share/doc/%{Ni} %i/share/%{Ni}
- cp -p lib/%{Ni}.a %i/lib
+ cp -p lib/*.a %i/lib
+ ln -s %{Ni}o.a %i/lib/%{Ni}.a
cp -p include/*.h %i/include
cp -p doc/{,maint_guide/}*.dvi %i/share/doc/%{Ni}
cp -p bin/sdesc %i/bin
cp -p bin/{b2l,l2b}.awk doc/*.doc %i/share/%{Ni}
sed -i'' -e 's,[$]%{Ni}/[bindoc]\{3\},%p/share/%{Ni},' %i/bin/sdesc
chmod -R a+rX %i
- sed -e '/INSTALLATION/,/done\./d' < README > HELP
- sed -e '1,/Introduction/d' -e "/1\.2\./,/'mkmake'.$/d" -e '/^ *mk/d' <
sysdep/darwin/README >> HELP
- sed -i'' -e 's,COPYRIGHT ,LICENSE ,' -e '/^sman/d' -e
's,%{Ni}/doc,%p/share/%{Ni},' -e 's,%{Ni}/bin,%p/bin,' \
- -e 's,scripts,script,' -e 's,headers,header,' -e 's,these,this,' -e
's,their,its,' HELP
+ sed -e '/INSTALLATION/,/done\.$/d' -e 's,COPYRIGHT ,LICENSE ,' < README |
uniq > HELP
<<
DocFiles: HELP LICENSE
Description: Computer algebra, specially on ordered fields
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
