Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12434
Modified Files:
gdl.patch gdl.info
Log Message:
Fix the isfinite() compilation error. Remove hdf-4 support, because it
seems to conflict with netcdf.
Index: gdl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/gdl.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gdl.info 19 Aug 2006 22:54:15 -0000 1.13
+++ gdl.info 17 Sep 2006 17:02:25 -0000 1.14
@@ -1,6 +1,6 @@
Package: gdl
Version: 0.8.11
-Revision: 2
+Revision: 3
Description: GNU Data Language
License: GPL
Maintainer: Sebastien Maret <[EMAIL PROTECTED]>
@@ -13,7 +13,7 @@
python24, python24-shlibs, readline5-shlibs, szip-shlibs, x11-shlibs
<<
BuildDepends: <<
- bzip2-dev, gsl, hdf (>= 4.2r0-3), hdf5 (>= 1.6.3-4), imagemagick-dev
+ bzip2-dev, gsl, hdf5 (>= 1.6.3-4), imagemagick-dev
(>= 6.1.8-1), lcms, libiconv-dev, libjpeg, libncurses5, libpng3,
libtiff, libtool14, libxml2, netcdf, plplot-dev, qhull, readline5,
szip, x11-dev
@@ -21,8 +21,7 @@
Source: mirror:sourceforge:gnudatalanguage/gdl-%v.tar.gz
Source-MD5: 837365b860889de03483cf84ae15b9b3
Patch: %n.patch
-ConfigureParams: --with-plplotdir=%p --with-ncursesdir=%p
--with-readlinedir=%p --with-gsldir=%p --with-netcdf=%p --with-hdf=%p
--with-hdf5=%p --with-python=%p --enable-python_version=2.4 --with-Magick=%p
-GCC: 3.3
+ConfigureParams: --with-plplotdir=%p --with-ncursesdir=%p
--with-readlinedir=%p --with-gsldir=%p --with-netcdf=%p --without-hdf
--with-hdf5=%p --with-python=%p --enable-python_version=2.4 --with-Magick=%p
InstallScript: <<
make install prefix=%i
mkdir -p %i/share/doc/%n
@@ -38,6 +37,9 @@
<<
Homepage: http://gnudatalanguage.sf.net/
DescPackaging: <<
+Fails to compile with netcdf and hdf-4 support, because some symbols
+are defined in both libraries. Disabling hdf-4 support for now.
+
Originally packaged by Jeffrey Whitaker
<<
Index: gdl.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/gdl.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdl.patch 4 Dec 2005 05:35:54 -0000 1.4
+++ gdl.patch 17 Sep 2006 17:02:25 -0000 1.5
@@ -1,33 +1,23 @@
-diff -ruN gdl-0.8.10/src/datatypes.cpp gdl-0.8.10.patched/src/datatypes.cpp
---- gdl-0.8.10/src/datatypes.cpp 2005-07-10 11:00:06.000000000 -0400
-+++ gdl-0.8.10.patched/src/datatypes.cpp 2005-08-10 13:07:46.000000000
-0400
-@@ -35,19 +35,11 @@
- #include <assert.h>
-
- // on OS X isnan is not defined
--#if defined(__APPLE__) && !defined(isnan)
-
--#ifdef __cplusplus
--extern "C" {
--#endif
--#define isnan( x ) ( ( sizeof ( x ) == sizeof(double) ) ? \
-- __isnand ( x ) : \
-- ( sizeof ( x ) == sizeof( float) ) ? \
-- __isnanf ( x ) : \
-- __isnan ( x ) )
--#ifdef __cplusplus
--}
--#endif
-+#if defined(__APPLE__) && !defined(isnan)
-+#define isnan( x ) ( ( sizeof ( (x) ) == sizeof( float) ) ? \
-+ __isnanf ( (float)(x) ) : \
-+ __isnand ( (double)(x) ) )
+diff -ruN -x '*~' gdl-0.8.11/src/basic_fun.cpp
gdl-0.8.11.patched/src/basic_fun.cpp
+--- gdl-0.8.11/src/basic_fun.cpp 2005-10-17 04:22:04.000000000 -0400
++++ gdl-0.8.11.patched/src/basic_fun.cpp 2006-09-17 12:11:19.000000000
-0400
+@@ -33,6 +33,13 @@
+ #include <unistd.h>
#endif
- using namespace std;
-diff -ruN gdl-0.8.10/src/math_fun_jmg.cpp
gdl-0.8.10.patched/src/math_fun_jmg.cpp
---- gdl-0.8.10/src/math_fun_jmg.cpp 2005-07-10 11:00:06.000000000 -0400
-+++ gdl-0.8.10.patched/src/math_fun_jmg.cpp 2005-08-10 13:08:02.000000000
-0400
++// on OS X isfinite is not defined
++#if defined(__APPLE__) && !defined(isfinite)
++#define isfinite( x ) ( ( sizeof ( (x) ) == sizeof( float) ) ? \
++ __isfinitef ( (float)(x) ) : \
++ __isfinited ( (double)(x) ) )
++#endif
++
+ #include "datatypes.hpp"
+ #include "envt.hpp"
+ #include "dpro.hpp"
+diff -ruN -x '*~' gdl-0.8.11/src/math_fun_jmg.cpp
gdl-0.8.11.patched/src/math_fun_jmg.cpp
+--- gdl-0.8.11/src/math_fun_jmg.cpp 2005-10-17 04:22:04.000000000 -0400
++++ gdl-0.8.11.patched/src/math_fun_jmg.cpp 2006-09-17 12:09:37.000000000
-0400
@@ -31,20 +31,10 @@
// on OS X isfinite is not defined
@@ -44,8 +34,8 @@
-#ifdef __cplusplus
-}
+#define isfinite( x ) ( ( sizeof ( (x) ) == sizeof( float) ) ? \
-+ __isfinitef ( (float)(x) ) : \
-+ __isfinited ( (double)(x) ) )
++ __isfinitef ( (float)(x) ) : \
++ __isfinited ( (double)(x) ) )
#endif
-#endif
-
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
