[freefem++] update to 3.19-1
Dominik Mierzejewski
rathann at fedoraproject.org
Fri Jul 13 22:01:40 UTC 2012
commit 3d45d57daaf4a1b258031f13c61accf0b98be484
Author: Dominik Mierzejewski <rpm at greysector.net>
Date: Sat Jul 14 00:01:27 2012 +0200
update to 3.19-1
- rebased patches
- dropped upstreamed patch
- enable gsl interface
- added missing include which breaks compilation with gcc-4.7
freefem++-gcc47.patch | 11 +++++
freefem++-ld.patch | 24 ----------
freefem++-rpm.patch | 114 ++++++++++++++----------------------------------
freefem++.spec | 24 +++++++---
4 files changed, 60 insertions(+), 113 deletions(-)
---
diff --git a/freefem++-gcc47.patch b/freefem++-gcc47.patch
new file mode 100644
index 0000000..6a02a6c
--- /dev/null
+++ b/freefem++-gcc47.patch
@@ -0,0 +1,11 @@
+diff -up freefem++-3.19-1/src/Graphics/getprog-unix.hpp.gcc47 freefem++-3.19-1/src/Graphics/getprog-unix.hpp
+--- freefem++-3.19-1/src/Graphics/getprog-unix.hpp.gcc47 2012-05-10 09:09:14.000000000 +0200
++++ freefem++-3.19-1/src/Graphics/getprog-unix.hpp 2012-07-13 23:47:12.000000000 +0200
+@@ -2,6 +2,7 @@
+ #if WIN32
+ #include "ff-win32.cpp"
+ #endif
++#include <unistd.h>
+ extern long mpirank;
+ extern long verbosity;
+ extern FILE *ThePlotStream; // Add for new plot. FH oct 2008
diff --git a/freefem++-rpm.patch b/freefem++-rpm.patch
index 5e0946b..8cd23b5 100644
--- a/freefem++-rpm.patch
+++ b/freefem++-rpm.patch
@@ -1,53 +1,7 @@
-diff -up freefem++-3.12/acoptim.m4.r freefem++-3.12/acoptim.m4
---- freefem++-3.12/acoptim.m4.r 2010-12-08 22:32:54.000000000 +0100
-+++ freefem++-3.12/acoptim.m4 2011-02-27 18:31:57.000000000 +0100
-@@ -49,14 +49,6 @@ AC_MSG_CHECKING(whether to generate debu
- AC_ARG_ENABLE(debug,[ --enable-debug Turn on debug versions of FreeFem++])
- AC_ARG_ENABLE(optim,[ --enable-optim Turn on compiler optimization])
-
--# Autoconf always chooses -O2. -O2 in gcc makes some functions
--# disappear. This is not ideal for debugging. And when we optimize, we
--# do not use -O2 anyway.
--
--CFLAGS="`echo $CFLAGS | sed 's/-O2//g'`"
--FFLAGS="`echo $FFLAGS | sed 's/-O2//g'`"
--CXXFLAGS="`echo $CXXFLAGS | sed 's/-O2//g'`"
--
- if test "$enable_debug" = yes;
- then
- AC_MSG_RESULT(yes)
-@@ -65,9 +57,9 @@ else
-
- # No debugging information in optimized code
-
-- CFLAGS="`echo $CFLAGS | sed 's/-g//g'` -DNDEBUG"
-- FFLAGS="`echo $FFLAGS | sed 's/-g//g'` -DNDEBUG"
-- CXXFLAGS="`echo $CXXFLAGS | sed 's/-g//g'` -DNDEBUG"
-+ CFLAGS="$CFLAGS -DNDEBUG"
-+ FFLAGS="$FFLAGS -DNDEBUG"
-+ CXXFLAGS="$CXXFLAGS -DNDEBUG"
- fi
-
- # Hardware-independant optimization
-@@ -101,6 +93,14 @@ if test "$enable_debug" != yes \
- -a "$enable_generic" != yes
- then
-
-+# Autoconf always chooses -O2. -O2 in gcc makes some functions
-+# disappear. This is not ideal for debugging. And when we optimize, we
-+# do not use -O2 anyway.
-+
-+CFLAGS="`echo $CFLAGS | sed 's/-O2//g'`"
-+FFLAGS="`echo $FFLAGS | sed 's/-O2//g'`"
-+CXXFLAGS="`echo $CXXFLAGS | sed 's/-O2//g'`"
-+
- # MacOS X Darwin
- if test -x /usr/bin/hostinfo
- then
-diff -up freefem++-3.12/configure.ac.r freefem++-3.12/configure.ac
---- freefem++-3.12/configure.ac.r 2011-01-18 13:41:41.000000000 +0100
-+++ freefem++-3.12/configure.ac 2011-02-27 18:31:57.000000000 +0100
-@@ -387,7 +387,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
+diff -up freefem++-3.13-3/configure.ac.r freefem++-3.13-3/configure.ac
+--- freefem++-3.13-3/configure.ac.r 2011-06-30 11:14:34.000000000 +0200
++++ freefem++-3.13-3/configure.ac 2011-07-13 21:59:28.000000000 +0200
+@@ -427,7 +427,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
# date is only useful for config-version.h
test "$prefix" = NONE && prefix="$ac_default_prefix"
@@ -56,7 +10,7 @@ diff -up freefem++-3.12/configure.ac.r freefem++-3.12/configure.ac
AC_MSG_CHECKING(prefix dir freefem++ )
AC_MSG_RESULT($ff_prefix_dir)
-@@ -1393,7 +1393,7 @@ then
+@@ -1528,7 +1528,7 @@ then
AC_CHECK_LIB(umfpack,umf_i_malloc,
ff_umfpack_libs=" -lumfpack $ff_umfpack_libs"
ff_umfpack_ok=yes,,$ff_umfpack_libs)
@@ -65,9 +19,9 @@ diff -up freefem++-3.12/configure.ac.r freefem++-3.12/configure.ac
AC_MSG_WARN([ Sorry we find UMFPACK lib but not the include umfpack.h file])
fi
fi
-diff -up freefem++-3.12/examples++-3d/Makefile.am.r freefem++-3.12/examples++-3d/Makefile.am
---- freefem++-3.12/examples++-3d/Makefile.am.r 2010-10-06 16:42:30.000000000 +0200
-+++ freefem++-3.12/examples++-3d/Makefile.am 2011-02-27 18:31:57.000000000 +0100
+diff -up freefem++-3.13-3/examples++-3d/Makefile.am.r freefem++-3.13-3/examples++-3d/Makefile.am
+--- freefem++-3.13-3/examples++-3d/Makefile.am.r 2010-10-06 16:42:30.000000000 +0200
++++ freefem++-3.13-3/examples++-3d/Makefile.am 2011-07-13 21:59:28.000000000 +0200
@@ -33,8 +33,8 @@ freefem++.pref:
echo loadpath += \"./\" >>freefem++.pref
@@ -79,13 +33,13 @@ diff -up freefem++-3.12/examples++-3d/Makefile.am.r freefem++-3.12/examples++-3d
-diff -up freefem++-3.12/examples++-load/load.link.in.r freefem++-3.12/examples++-load/load.link.in
---- freefem++-3.12/examples++-load/load.link.in.r 2011-01-13 22:14:02.000000000 +0100
-+++ freefem++-3.12/examples++-load/load.link.in 2011-02-27 18:31:57.000000000 +0100
+diff -up freefem++-3.13-3/examples++-load/load.link.in.r freefem++-3.13-3/examples++-load/load.link.in
+--- freefem++-3.13-3/examples++-load/load.link.in.r 2011-04-18 11:53:56.000000000 +0200
++++ freefem++-3.13-3/examples++-load/load.link.in 2011-07-13 22:03:23.000000000 +0200
@@ -13,13 +13,13 @@ if [ -z "$CXX" ] ; then CXX='@CXX@' ; fi
- if [ -z "$MPICXX" ] ; then MPICXX='@MPICXX@' ; fi
- if [ -z "$MPI_LIB" ] ; then MPI_LIB='@MPI_LIB@' ; fi
- if [ -z "$F77" ] ; then F77='@F77@' ; fi
+ if [ -z "$MPICXX" ] ; then MPICXX="@MPICXX@" ; fi
+ if [ -z "$MPI_LIB" ] ; then MPI_LIB="@MPI_LIB@" ; fi
+ if [ -z "$F77" ] ; then F77="@F77@" ; fi
-if [ "$CXX" = '@'CXX'@' ] ; then CXX=""; fi
-if [ "$MPICXX" = '@'MPICXX'@' ] ; then MPICXX=""; fi
-if [ "$F77" = '@'F77'@' ] ; then F77=""; fi
@@ -114,10 +68,10 @@ diff -up freefem++-3.12/examples++-load/load.link.in.r freefem++-3.12/examples++
else
ff=`which freefem++.exe`;
ffinc=`dirname "$ff"`/examples++-load/include
-diff -up freefem++-3.12/examples++-load/Makefile.am.r freefem++-3.12/examples++-load/Makefile.am
---- freefem++-3.12/examples++-load/Makefile.am.r 2011-01-19 13:55:26.000000000 +0100
-+++ freefem++-3.12/examples++-load/Makefile.am 2011-02-27 18:31:57.000000000 +0100
-@@ -102,7 +102,7 @@ all.edp:
+diff -up freefem++-3.13-3/examples++-load/Makefile.am.r freefem++-3.13-3/examples++-load/Makefile.am
+--- freefem++-3.13-3/examples++-load/Makefile.am.r 2011-05-25 10:34:03.000000000 +0200
++++ freefem++-3.13-3/examples++-load/Makefile.am 2011-07-13 22:06:52.000000000 +0200
+@@ -107,7 +107,7 @@ all.edp:
regtests.edp: regtests.m4 ../regtests.m4
m4 -DASSERT regtests.m4 > regtests.edp
@@ -126,14 +80,14 @@ diff -up freefem++-3.12/examples++-load/Makefile.am.r freefem++-3.12/examples++-
clean-local:
-rm *.o load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
-@@ -129,20 +129,19 @@ FORCE: ;
+@@ -134,19 +134,19 @@ FORCE: ;
freefem++.pref:
echo loadpath = \"./\" >freefem++.pref
install-exec-local:: load_compile
- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/lib
- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/include
- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/etc
-- $(INSTALL_DATA) clapack.h ppmimg.h include/* $(DESTDIR)$(ff_prefix_dir)/include
+- $(INSTALL_DATA) clapack.h ppmimg.h bmo.hpp msh3.hpp pcm.hpp include/* $(DESTDIR)$(ff_prefix_dir)/include
- $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
- echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
@@ -141,34 +95,33 @@ diff -up freefem++-3.12/examples++-load/Makefile.am.r freefem++-3.12/examples++-
+ $(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++
+ $(mkinstalldirs) -m 755 $(DESTDIR)$(includedir)/freefem++
+ $(mkinstalldirs) -m 755 $(DESTDIR)$(sysconfdir)
-+ $(INSTALL_DATA) include/* $(DESTDIR)$(includedir)/freefem++
-+ $(INSTALL) -m 755 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
++ $(INSTALL_DATA) ppmimg.h bmo.hpp msh3.hpp pcm.hpp include/* $(DESTDIR)$(includedir)/freefem++
++ $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
+ echo loadpath += \"./\" >$(DESTDIR)$(sysconfdir)/freefem++.pref
+ echo loadpath += \"$(libdir)/freefem++\" >>$(DESTDIR)$(sysconfdir)/freefem++.pref
-+ echo includepath += \"$(datadir)/freefem++/idp\" >>$(DESTDIR)$(sysconfdir)/freefem++.pref
++ echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(sysconfdir)/freefem++.pref
$(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
-for i in $(LIST_COMPILE_PKG); do \
- if [ -f $$i ] ; then $(INSTALL) -m 555 $$i $(DESTDIR)$(ff_prefix_dir)/lib; fi; done
--
-+ if [ -f $$i ] ; then $(INSTALL) -m 755 $$i $(DESTDIR)$(libdir)/freefem++; fi; done
++ if [ -f $$i ] ; then $(INSTALL) -m 755 $$i $(DESTDIR)$(libdir)/freefem++; fi; done
-diff -up freefem++-3.12/Makefile.am.r freefem++-3.12/Makefile.am
---- freefem++-3.12/Makefile.am.r 2011-01-20 08:31:58.000000000 +0100
-+++ freefem++-3.12/Makefile.am 2011-02-27 18:34:28.000000000 +0100
-@@ -34,7 +34,7 @@ examples++-3d/dodecaedre01.mesh \
- examples++-3d/lac-leman-v4.msh \
+diff -up freefem++-3.13-3/Makefile.am.r freefem++-3.13-3/Makefile.am
+--- freefem++-3.13-3/Makefile.am.r 2011-02-09 21:01:58.000000000 +0100
++++ freefem++-3.13-3/Makefile.am 2011-07-13 22:01:53.000000000 +0200
+@@ -35,7 +35,7 @@ examples++-3d/lac-leman-v4.msh \
examples++-load/load.link \
+ examples++-load/fig.pgm examples++-load/lg.pgm \
./examples++-mpi/regtests.sh ./examples++-other/speedtest.sh \
-./download/fftw/Makefile ./download/fftw/Makefile.am \
+./download/fftw/Makefile \
examples++*/*.[ie]dp CheckAllEdp
-@@ -150,15 +150,15 @@ clean-local::
+@@ -151,15 +151,15 @@ clean-local::
# Native MacOS packaging
# ----------------------
install-exec-local::
@@ -187,10 +140,9 @@ diff -up freefem++-3.12/Makefile.am.r freefem++-3.12/Makefile.am
find . -name '*.[ei]dp' -o -name '*.h*' -o -name '*.cpp' -o -name '*.pgm' |egrep '[.]/examples++' >>$@
find . -name '*.h*' -o -name '*.cpp' |egrep '[.]/examples++' >>$@
List-agl-dylib: src/nw/FreeFem++
-diff -up freefem++-3.12/src/Carbon.r freefem++-3.12/src/Carbon
-diff -up freefem++-3.12/src/lglib/Makefile.am.r freefem++-3.12/src/lglib/Makefile.am
---- freefem++-3.12/src/lglib/Makefile.am.r 2010-06-16 14:33:50.000000000 +0200
-+++ freefem++-3.12/src/lglib/Makefile.am 2011-02-27 18:31:57.000000000 +0100
+diff -up freefem++-3.13-3/src/lglib/Makefile.am.r freefem++-3.13-3/src/lglib/Makefile.am
+--- freefem++-3.13-3/src/lglib/Makefile.am.r 2010-06-16 14:33:50.000000000 +0200
++++ freefem++-3.13-3/src/lglib/Makefile.am 2011-07-13 21:59:28.000000000 +0200
@@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
diff --git a/freefem++.spec b/freefem++.spec
index 7135b03..6affb05 100644
--- a/freefem++.spec
+++ b/freefem++.spec
@@ -1,10 +1,10 @@
-%define dotpl %{nil}
-%define dashpl %{nil}
+%define dotpl .1
+%define dashpl -1
Summary: PDE solving tool
Name: freefem++
-Version: 3.12
-Release: 3%{dotpl}%{?dist}
+Version: 3.19
+Release: 1%{dotpl}%{?dist}
URL: http://www.freefem.org/ff++/index.htm
Group: Applications/Engineering
Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}%{dashpl}.tar.gz
@@ -12,8 +12,8 @@ Source1: FreeFem++.1
Patch0: %{name}-rpm.patch
Patch2: %{name}-name.patch
Patch3: %{name}-tex.patch
-Patch4: %{name}-ld.patch
Patch5: %{name}-compile.patch
+Patch6: %{name}-gcc47.patch
License: LGPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: arpack-devel
@@ -25,6 +25,7 @@ BuildRequires: flex
BuildRequires: fltk-devel
BuildRequires: gcc-gfortran
BuildRequires: glut-devel
+BuildRequires: gsl-devel
BuildRequires: ImageMagick
BuildRequires: lapack-devel
BuildRequires: libGLU-devel
@@ -84,8 +85,8 @@ This package contains the MPI version of FreeFem++.
%patch0 -p1 -b .r
%patch2 -p1
%patch3 -p1 -b .t
-%patch4 -p1 -b .ld
%patch5 -p1 -b .compile
+%patch6 -p1 -b .gcc47
find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" -o -name "*.edp" \) | xargs chmod 644
for file in AUTHORS ChangeLog COPYRIGHT COPYING HISTORY ; do
iconv -f iso8859-1 -t utf8 -o $file.utf8 $file && \
@@ -97,7 +98,7 @@ done
. /etc/profile.d/modules.sh
module load openmpi-%{_arch}
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
-touch examples++-load/WHERE_LIBRARY
+#touch examples++-load/WHERE_LIBRARY
autoreconf -vif
%configure \
INSTALL="%{__install} -p" \
@@ -108,7 +109,7 @@ autoreconf -vif
--with-mpi=mpic++
%{__make} %{?_smp_mflags}
-%{__make} -C examples++-load load_compile %{?_smp_mflags}
+#%{__make} -C examples++-load load_compile %{?_smp_mflags}
%{__make} documentation
%install
@@ -173,6 +174,13 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
%{_bindir}/ff-mpirun
%changelog
+* Fri Jul 13 2012 Dominik Mierzejewski <rpm at greysector.net> 3.19-1.1
+- update to 3.19-1
+- rebased patches
+- dropped upstreamed patch
+- enable gsl interface
+- added missing include which breaks compilation with gcc-4.7
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.12-3
- Rebuilt for c++ ABI breakage
More information about the scm-commits
mailing list