Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9920
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.4/unstable/main/finkinfo/sci/gdl.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gdl.info 19 Aug 2006 22:53:32 -0000 1.9 +++ gdl.info 17 Sep 2006 16:56:59 -0000 1.10 @@ -1,6 +1,6 @@ Package: gdl Version: 0.8.11 -Revision: 1007 +Revision: 1008 Description: GNU Data Language License: GPL Maintainer: Sebastien Maret <[EMAIL PROTECTED]> @@ -15,7 +15,7 @@ readline5-shlibs (>= 5.0-1004), szip-shlibs, x11-shlibs << BuildDepends: << - bzip2-dev, gsl, hdf (>= 4.2r0-3), hdf5 (>= 1.6.5-1002), + bzip2-dev, gsl, hdf5 (>= 1.6.5-1002), imagemagick-dev (>= 6.1.8-1002), lcms, libiconv-dev, libjpeg, libncurses5 (>= 5.4-20041023-1006), libpng3, libtiff, libtool14, libxml2, netcdf (>= 3.6.0-1002), plplot-dev, qhull, @@ -24,8 +24,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 @@ -41,6 +40,10 @@ << Homepage: http://gnudatalanguage.sf.net/ DescPackaging: << -Originally packaged by Jeffrey Whitaker +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.4/unstable/main/finkinfo/sci/gdl.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gdl.patch 20 Jan 2006 20:30:40 -0000 1.1 +++ gdl.patch 17 Sep 2006 16:56:59 -0000 1.2 @@ -1,12 +1,13 @@ -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 @@ +diff -ruN gdl-0.8.11/src/datatypes.cpp gdl-0.8.11.patched/src/datatypes.cpp +--- gdl-0.8.11/src/datatypes.cpp 2005-10-17 04:22:04.000000000 -0400 ++++ gdl-0.8.11.patched/src/datatypes.cpp 2006-09-03 16:42:32.000000000 -0400 +@@ -34,22 +34,6 @@ + // needed with gcc-3.3.2 #include <assert.h> - // on OS X isnan is not defined +-// on OS X isnan is not defined -#if defined(__APPLE__) && !defined(isnan) - +- -#ifdef __cplusplus -extern "C" { -#endif @@ -18,20 +19,20 @@ -#ifdef __cplusplus -} -#endif -+#if defined(__APPLE__) && !defined(isnan) -+#define isnan( x ) ( ( sizeof ( (x) ) == sizeof( float) ) ? \ -+ __isnanf ( (float)(x) ) : \ -+ __isnand ( (double)(x) ) ) - #endif - +-#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 -@@ -31,20 +31,10 @@ - // on OS X isfinite is not defined - #if defined(__APPLE__) && !defined(isfinite) + // this (ugly) including of other sourcefiles has to be done, because +diff -ruN 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-03 16:42:18.000000000 -0400 +@@ -29,23 +29,6 @@ + //#define GDL_DEBUG + #undef GDL_DEBUG + +-// on OS X isfinite is not defined +-#if defined(__APPLE__) && !defined(isfinite) - -#ifdef __cplusplus -extern "C" { @@ -43,12 +44,10 @@ - __isfinite ( x ) ) -#ifdef __cplusplus -} -+#define isfinite( x ) ( ( sizeof ( (x) ) == sizeof( float) ) ? \ -+ __isfinitef ( (float)(x) ) : \ -+ __isfinited ( (double)(x) ) ) - #endif +-#endif -#endif - - +- using namespace std; + namespace lib { ------------------------------------------------------------------------- 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 Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits