Update of /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3512
Modified Files:
saclib.info qepcad.info
Added Files:
saclib.patch
Log Message:
seems OK now. Still some testing..
Index: qepcad.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/qepcad.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qepcad.info 28 Sep 2008 22:15:09 -0000 1.1
+++ qepcad.info 6 Nov 2008 19:50:03 -0000 1.2
@@ -1,8 +1,9 @@
Package: qepcad
Version: 1.50
Revision: 1
-Source: http://www.cs.usna.edu/~qepcad/INSTALL/%N-B.%v.tar.gz
-Source-MD5: bb0464e75bee90bbb7f737e281febc51
+#Source: http://www.cs.usna.edu/~qepcad/INSTALL/%N-B.%v.tar.gz
+Source: http://www.cs.usna.edu/~wcbrown/qesource.tar.gz
+Source-MD5: 517f5a8c49a8a89ecbae37897288f522
SourceDirectory: qesource
BuildDepends: freeglut, readline5, saclib, sed
@@ -10,6 +11,7 @@
PatchScript: <<
#!/bin/sh -ev
+find . -name '*.o' -exec rm -f \{\} \;
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,O4,O3 -fstrict-aliasing -Wall -mdynamic-no-pic,'
{.,cad2d,plot2d,source}/Makefile extensions/adj2d/new_make
--- NEW FILE: saclib.patch ---
################################################
# mksysdep.pl V 0.0
# Created by Chris Brown, 20 May, 208
################################################
if (! $ENV{'saclib'})
{
print "SACLIB Error: The saclib environment variable must be set!\n";
exit(1);
}
### Get architecture type
$ptype = "unknown";
$uname = `uname -mpi`;
if ($uname =~ /i\S*86/)
{
$ptype = "x86";
}
elsif ($uname =~ /Sun|sun|SUN|Sparc|sparc|SPARC/)
{
$ptype = "sparc";
}
else
{
print "SACLIB Warning: Could not determine processor type!\n";
}
### Get OS type
$ostype = "unknown";
$uname = `uname -s`;
if ($uname =~ /linux|Linux|LINUX/)
{
$ostype = "linux";
}
elsif ($uname =~ /Sun|sun|SUN|solaris|Solaris/)
{
$ostype = "solaris";
}
else
{
print "SACLIB Warning: Could not determine OS type!\n";
}
### Copy system dependent files
### Create sysdep.h
$littleEndian = "/* Created by $saclib/bin/mksysdep.pl */
#ifndef LITTLE_ENDIAN
#define LITTLE_ENDIAN
#endif
#undef BIG_ENDIAN
";
$bigEndian = "/* Created by $saclib/bin/mksysdep.pl */
#ifndef BIG_ENDIAN
#define BIG_ENDIAN
#endif
#undef LITTLE_ENDIAN
";
open(SYSDEP,"> $ENV{'saclib'}/include/sysdep.h");
if ($ptype eq "x86" && $ostype eq "linux")
{
print SYSDEP $littleEndian;
print SYSDEP "#define _X86_LINUX_\n";
system("bash -c \"pushd $ENV{'saclib'}/sysdep/linuxX86 ; ./install ;
popd\"");
}
elsif ($ptype eq "sparc" && $ostype eq "solaris")
{
print SYSDEP $bigEndian;
print SYSDEP "#define _SPARC_SOLARIS_\n";
system("bash -c \"pushd $ENV{'saclib'}/sysdep/solarisSparc ; ./install ;
popd\"");
}
Index: saclib.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/saclib.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- saclib.info 29 Sep 2008 15:49:48 -0000 1.4
+++ saclib.info 6 Nov 2008 19:50:03 -0000 1.5
@@ -1,11 +1,13 @@
Package: saclib
Version: 2.2.0
Revision: 1
-Source: http://www.cs.usna.edu/~qepcad/INSTALL/saclib2.2.0.tar.gz
-Source-MD5: a13ce148b1289bd284b692b9ba290e3d
+#Source: http://www.cs.usna.edu/~qepcad/INSTALL/saclib2.2.0.tar.gz
+Source: http://www.cs.usna.edu/~wcbrown/saclib2.2.0.tar.gz
+Source-MD5: 6fd2489018a0d163338a9dcd42f72e48
PatchScript: <<
#!/bin/sh -ev
- sed -e '/Get architecture type/,/else/s,else,elsif ($uname =~
/ppc|PPC|powerpc/)\n{\n\t$ptype = "ppc";\n}\n&,' \
+ cp -p %a/%n.patch bin/mksysdep.pl~
+ sed -e '/Get architecture type/,/else/s,else,elsif ($uname =~
/ppc|PPC|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 */\
@@ -38,10 +40,6 @@
sed -i'' -e "s,XsaclibX,'saclib'," bin/mksysdep.pl
cp -pPR sysdep/archive/generic sysdep/darwin
cp -p sysdep/linuxX86/GC.c sysdep/darwin/src
-## FPCATCH needed, and the following doesn't work ..
-# cp -p sysdep/solarisSparc/FP{CATCH,HAND}.c sysdep/darwin/src
-# sed -i'' -e '/saclib.h/a\
-##include <signal.h>' sysdep/darwin/src/FP{CATCH,HAND}.c
sed -i'' -e 's,generic,darwin,' sysdep/darwin/install
rm sysdep/darwin/src/FAIL_varargs.c
add_def="`grep -e BETA2 -e 'define LARGE' -e 'define SMALL' -e
'N[MLS]PRIME_' include/sacsys.h~|sed -e 's,$,\\\,'`"
@@ -51,10 +49,13 @@
sed -i'' -e '/<malloc\.h>/d' src/IQR.c
sed -i'' -e 's,SACFLAG= ,"SACFLAG=-O3 -fstrict-aliasing -Wall
-mdynamic-no-pic" ,' sysdep/darwin/bin/mklib
sed -i'' -e 's,_X86_LINUX_,__APPLE__,' -e '/ieee754\.h/d' include/hfloats.h
+## avoid "...will break strict-aliasing rules" warnings:
+ sed -i'' -e '\Xsaclib/lib/obj$Xa\
+make CC=$CC "SACFLAG=-O3 -Wall -mdynamic-no-pic" EXTENSION= MMAPFS.o MMPDDF.o
MMPFBL.o' sysdep/darwin/bin/mklib
<<
CompileScript: <<
#!/bin/sh -ev
- export saclib=%b
+ export saclib=`pwd`
mkdir -p lib/obj
cd bin; ./sconf
<<
-------------------------------------------------------------------------
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
