rpms/gdl/devel gdl-0.9rc1-cvs.patch, NONE, 1.1 gdl-0.9rc1-magick.patch, NONE, 1.1 gdl.spec, 1.35, 1.36 gdl-0.9rc1-automake.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Fri May 16 17:53:24 UTC 2008
Author: orion
Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30380
Modified Files:
gdl.spec
Added Files:
gdl-0.9rc1-cvs.patch gdl-0.9rc1-magick.patch
Removed Files:
gdl-0.9rc1-automake.patch
Log Message:
* Fri May 16 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc1.3
- Update to latest cvs
- Add patch to handle new ImageMagick
- Update netcdf locations
gdl-0.9rc1-cvs.patch:
--- NEW FILE gdl-0.9rc1-cvs.patch ---
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc1/aclocal.m4 cvs/gdl/aclocal.m4
--- gdl-0.9rc1/aclocal.m4 2008-04-03 16:09:29.000000000 -0600
+++ cvs/gdl/aclocal.m4 2008-05-16 09:54:36.000000000 -0600
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,14 +11,17 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -106,7 +109,6 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
-
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
@@ -208,6 +210,8 @@
;;
esac
+_LT_REQUIRED_DARWIN_CHECKS
+
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
@@ -287,9 +291,80 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
])# _LT_LINKER_BOILERPLATE
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+ case $host_os in
+ rhapsody* | darwin*)
+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi])
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[0123]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+])
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
@@ -614,7 +689,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *) LD="${LD-ld} -64" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
esac
;;
esac
@@ -707,7 +786,7 @@
$2=yes
fi
fi
- $rm conftest*
+ $rm -r conftest*
LDFLAGS="$save_LDFLAGS"
])
@@ -978,7 +1057,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
@@ -986,7 +1065,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
])
])
])
@@ -1303,7 +1382,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[[4-9]]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -1836,6 +1915,13 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -2335,7 +2421,7 @@
[...3749 lines suppressed...]
delete[] buf;
}
- T& operator[]( SizeT ix)
+ T& operator[]( SizeT ix) throw()
{
return buf[ ix];
}
- const T& operator[]( SizeT ix) const
+ const T& operator[]( SizeT ix) const throw()
{
return buf[ ix];
}
- GDLArray& operator=( const GDLArray& right)
+ GDLArray& operator=( const GDLArray& right) throw()
{
assert( sz == right.size());
// if( &right != this)
@@ -310,74 +310,74 @@
// }
return *this;
}
- GDLArray&operator+=( const GDLArray& right)
+ GDLArray&operator+=( const GDLArray& right) throw()
{
for( SizeT i=0; i<sz; ++i)
buf[ i] += right.buf[ i];
return *this;
}
- GDLArray&operator-=( const GDLArray& right)
+ GDLArray&operator-=( const GDLArray& right) throw()
{
for( SizeT i=0; i<sz; ++i)
buf[ i] -= right.buf[ i];
return *this;
}
- GDLArray&operator*=( const GDLArray& right)
- {
- for( SizeT i=0; i<sz; ++i)
- buf[ i] *= right.buf[ i];
- return *this;
- }
- GDLArray&operator/=( const GDLArray& right)
- {
- for( SizeT i=0; i<sz; ++i)
- buf[ i] /= right.buf[ i];
- return *this;
- }
- GDLArray&operator+=( const T& right)
+// GDLArray&operator*=( const GDLArray& right) throw()
+// {
+// for( SizeT i=0; i<sz; ++i)
+// buf[ i] *= right.buf[ i];
+// return *this;
+// }
+// GDLArray&operator/=( const GDLArray& right)
+// {
+// for( SizeT i=0; i<sz; ++i)
+// buf[ i] /= right.buf[ i]; // can be 0
+// return *this;
+// }
+ GDLArray&operator+=( const T& right) throw()
{
for( SizeT i=0; i<sz; ++i)
buf[ i] += right;
return *this;
}
- GDLArray&operator-=( const T& right)
+ GDLArray&operator-=( const T& right) throw()
{
for( SizeT i=0; i<sz; ++i)
buf[ i] -= right;
return *this;
}
- GDLArray&operator*=( const T& right)
- {
- for( SizeT i=0; i<sz; ++i)
- buf[ i] *= right;
- return *this;
- }
- GDLArray&operator/=( const T& right)
- {
- for( SizeT i=0; i<sz; ++i)
- buf[ i] /= right;
- return *this;
- }
+// GDLArray&operator*=( const T& right) throw()
+// {
+// for( SizeT i=0; i<sz; ++i)
+// buf[ i] *= right;
+// return *this;
+// }
+// GDLArray&operator/=( const T& right)
+// {
+// for( SizeT i=0; i<sz; ++i)
+// buf[ i] /= right; // can be 0
+// return *this;
+// }
- void SetBuffer( T* b)
+ void SetBuffer( T* b) throw()
{
buf = b;
}
- T* GetBuffer()
+ T* GetBuffer() throw()
{
return buf;
}
- void SetBufferSize( SizeT s)
+ void SetBufferSize( SizeT s) throw()
{
sz = s;
}
- SizeT size() const
+ SizeT size() const throw()
{
return sz;
}
- void resize( SizeT newSz)
+ void resize( SizeT newSz) throw()
{
assert( newSz > sz);
T* newBuf = new T[ newSz];
Only in gdl-0.9rc1/src: .#typedefs.hpp.1.11
Only in gdl-0.9rc1/src: typedefs.hpp.new
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc1/testsuite/test_factorial.pro cvs/gdl/testsuite/test_factorial.pro
--- gdl-0.9rc1/testsuite/test_factorial.pro 1969-12-31 17:00:00.000000000 -0700
+++ cvs/gdl/testsuite/test_factorial.pro 2008-04-17 08:55:41.000000000 -0600
@@ -0,0 +1,42 @@
+;
+; AC 17/04/2008
+; under GNU/GPL
+;
+; testing the FACTORIAL() function
+;
+pro TEST_FACTORIAL, min_val=min_val, max_val=max_val, $
+ input=input, help=help
+;
+if KEYWORD_SET(help) then begin
+ print, 'pro TEST_FACTORIAL, min_val=min_val, max_val=max_val, $'
+ print, ' input=input, help=help'
+ return
+endif
+;
+if N_ELEMENTS(input) EQ 0 then input=[1,2,3,4, 26]
+;
+format_i=STRCOMPRESS('('+STRING(N_ELEMENTS(input))+'i14)',/remove_all)
+format_g=STRCOMPRESS('('+STRING(N_ELEMENTS(input))+'g14.8)',/remove_all)
+;
+print, format=format_i, input
+print, format=format_g, FACTORIAL(input)
+print, format=format_g, FACTORIAL(input+0.)
+print, format=format_i, FACTORIAL(input, /ul64)
+print, format=format_i, FACTORIAL(input+0., /ul64)
+print, format=format_g, FACTORIAL(input, /ul64, /stirling)
+print, format=format_g, FACTORIAL(input+0., /ul64, /stirling)
+print, format=format_g, FACTORIAL(input, /stirling)
+print, format=format_g, FACTORIAL(input+0., /stirling)
+;
+if N_ELEMENTS(min_val) EQ 0 then min_val=0
+if N_ELEMENTS(max_val) EQ 0 then max_val=10
+;
+; 12345671234567890ABCD1234567890ABCD1234567890ABCD1234567890AB
+print, 'index | def. int | /ul64 | float | /stirling'
+for i=min_val, max_val do begin
+ print, format='(i6,a2, i16, i16, g14.8,g14.8)', i, ' ',$
+ FACTORIAL(i), FACTORIAL(i,/ul), $
+ FACTORIAL(FLOAT(i)), FACTORIAL(i,/stirling)
+endfor
+
+end
diff -ru --unidirectional-new-file --exclude=CVS gdl-0.9rc1/testsuite/test_suite.pro cvs/gdl/testsuite/test_suite.pro
--- gdl-0.9rc1/testsuite/test_suite.pro 2008-04-03 16:09:24.000000000 -0600
+++ cvs/gdl/testsuite/test_suite.pro 2008-05-16 09:54:39.000000000 -0600
@@ -6,9 +6,9 @@
if 0 then begin & end $
else if 1 then $
if 0 then begin & end $
-else a=1
+else a=1e
-if a ne 1 then print,'***IF: ERROR'
+if a ne 1e then print,'***IF: ERROR'
print,'IF: OK'
end
@@ -80,7 +80,7 @@
'a': begin
print,'***CASE: ERROR'
end
- 1.0: print,'***CASE: ERROR'
+ 1.0d: print,'***CASE: ERROR'
else: e=1
end
Only in gdl-0.9rc1: tmp
gdl-0.9rc1-magick.patch:
--- NEW FILE gdl-0.9rc1-magick.patch ---
--- gdl-0.9rc1/configure.magick 2008-05-16 11:45:56.000000000 -0600
+++ gdl-0.9rc1/configure 2008-05-16 11:48:06.000000000 -0600
@@ -20655,16 +20655,16 @@
INCLUDES="$INCLUDES -I$with_Magick/include"
else
LIBS="$LIBS -lMagick++"
- INCLUDES="$INCLUDES -I/usr/include/magick"
+ INCLUDES="$INCLUDES -I/usr/include/ImageMagick"
fi
- { echo "$as_me:$LINENO: checking for GetMagickVersion in -lMagick" >&5
-echo $ECHO_N "checking for GetMagickVersion in -lMagick... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for GetMagickVersion in -lMagick++" >&5
+echo $ECHO_N "checking for GetMagickVersion in -lMagick++... $ECHO_C" >&6; }
if test "${ac_cv_lib_Magick_GetMagickVersion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lMagick $LIBS"
+LIBS="-lMagick++ $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gdl.spec 28 Apr 2008 16:26:25 -0000 1.35
+++ gdl.spec 16 May 2008 17:52:26 -0000 1.36
@@ -1,6 +1,6 @@
Name: gdl
Version: 0.9
-Release: 0.rc1.2%{?dist}
+Release: 0.rc1.3%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -9,9 +9,10 @@
Source0: http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc1.tar.gz
Source1: gdl.csh
Source2: gdl.sh
-Patch0: gdl-0.9rc1-automake.patch
+Patch0: gdl-0.9rc1-cvs.patch
Patch1: gdl-0.9pre5-ppc64.patch
Patch2: gdl-0.9pre6-gcc43.patch
+Patch3: gdl-0.9rc1-magick.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: readline-devel, ncurses-devel
@@ -29,16 +30,17 @@
%prep
%setup -q -n %{name}-%{version}rc1
-%patch0 -p0 -b .automake
+%patch0 -p1 -b .cvs
%patch1 -p1 -b .ppc64
%patch2 -p1 -b .gcc43
+%patch3 -p1 -b .magick
%build
export CPPFLAGS="-DH5_USE_16_API"
%configure --disable-dependency-tracking --disable-static --with-fftw \
- INCLUDES="-I/usr/include/netcdf-3 -I/usr/include/hdf" \
- LIBS="-L%{_libdir}/netcdf-3 -L%{_libdir}/hdf"
+ INCLUDES="-I/usr/include/netcdf -I/usr/include/hdf" \
+ LIBS="-L%{_libdir}/hdf"
make %{?_smp_mflags}
@@ -70,6 +72,11 @@
%changelog
+* Fri May 16 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc1.3
+- Update to latest cvs
+- Add patch to handle new ImageMagick
+- Update netcdf locations
+
* Mon Apr 28 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc1.2
- Rebuild for new ImageMagick
--- gdl-0.9rc1-automake.patch DELETED ---
More information about the fedora-extras-commits
mailing list