[freefem++] fix compilation and build against SuperLU

Tue Feb 25 13:05:51 UTC 2014

commit 7101c406fcb83f71e2a11cc6713eebf3be6718f8
Author: Dominik Mierzejewski <rpm at greysector.net>
Date:   Tue Feb 25 14:06:27 2014 +0100

    fix compilation and build against SuperLU

 freefem++-rpm.patch |   40 +++++++++++++++++++++++++---------------
 freefem++.spec      |   13 +++++--------
 2 files changed, 30 insertions(+), 23 deletions(-)
---

diff --git a/freefem++-rpm.patch b/freefem++-rpm.patch
index dbfc8e3..dbc9a4a 100644
--- a/freefem++-rpm.patch
+++ b/freefem++-rpm.patch
@@ -1,6 +1,15 @@
-diff -up freefem++-3.26-2/configure.ac.r freefem++-3.26-2/configure.ac
---- freefem++-3.26-2/configure.ac.r	2013-11-28 11:07:42.000000000 +0100
-+++ freefem++-3.26-2/configure.ac	2013-11-28 19:37:25.135561522 +0100
+diff -up serial/configure.ac.r serial/configure.ac
+--- serial/configure.ac.r	2014-01-24 21:59:06.000000000 +0100
++++ serial/configure.ac	2014-02-25 12:02:23.862793580 +0100
+@@ -62,7 +62,7 @@ m4_define([AC_FF_WHERELIB],
+ 	    echo "$1 LD $2"  >>$ff_where_lib_conf
+ 	    ff_WHERE_INC=`AS_DIRNAME(["$3"])`
+ 	    case "$ff_WHERE_INC" in 
+-		/*)e cho "$1 INCLUDE -I$ff_WHERE_INC"  >>$ff_where_lib_conf ;;
++		*) echo "$1 INCLUDE -I$ff_WHERE_INC"  >>$ff_where_lib_conf ;;
+ 	    esac
+ 	fi
+ 	AC_MSG_RESULT($ff_WHERE)
 @@ -486,7 +486,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
  # date is only useful for config-version.h
  
@@ -33,7 +42,7 @@ diff -up freefem++-3.26-2/configure.ac.r freefem++-3.26-2/configure.ac
  TOOL_DISABLE(umfpack,UMFPACK64.$DYLIB_SUFFIX)
  TOOL_DISABLE(yams,freeyams.$DYLIB_SUFFIX)
  TOOL_DISABLE(pipe,pipe.$DYLIB_SUFFIX)
-@@ -1734,7 +1743,7 @@ test -n "$ff_mkl_scalapack" && ff_scalap
+@@ -1734,16 +1743,16 @@ test -n "$ff_mkl_scalapack" && ff_scalap
  test -n "$ff_mkl_root" && ff_winc="$ff_mkl_root/include/mkl_blas.h"
  
  m4_map([AC_FF_WHERELIB],[
@@ -42,9 +51,10 @@ diff -up freefem++-3.26-2/configure.ac.r freefem++-3.26-2/configure.ac
  	[[mumps_ptscotch],[-lpord_ptscotch -lmumps_common_ptscotch -ldmumps_ptscotch -lzmumps_ptscotch -lpord_ptscotch],[dmumps_c.h]],
  	[[mumps_scotch],[-lpord_scotch -lmumps_common_scotch -ldmumps_scotch -lzmumps_scotch -lpord_scotch],[dmumps_c.h]],
  	[[hypre],[-lHYPRE]],
-@@ -1742,8 +1751,8 @@ m4_map([AC_FF_WHERELIB],[
+ 	[[fftw3],[-lfftw3],[/usr/include/fftw3.h],[]],
  	[[superlu_dist],[-lsuperlu-dist],[/usr/include/superlu-dist/superlu_defs.h],[]],
- 	[[superlu],[-lsuperlu],[/usr/include/superlu/superlu_enum_consts.h],[]],
+-	[[superlu],[-lsuperlu],[/usr/include/superlu/superlu_enum_consts.h],[]],
++	[[superlu],[-lsuperlu],[/usr/include/SuperLU/superlu_enum_consts.h],[]],
  	[[Superlu4],[-lsuperlu4],[/usr/include/superlu4/superlu_enum_consts.h],[]],
 -        [[blacs],[ -lblacsCinit$ff_with_mpi	-lblacsF77init$ff_with_mpi	-lblacs$ff_with_mpi],[]],
 -        [[scalapack],[-lscalapack$ff_with_mpi],[]],
@@ -53,9 +63,9 @@ diff -up freefem++-3.26-2/configure.ac.r freefem++-3.26-2/configure.ac
          [[scotch],[-lscotch -lscotcherr],[]],
          [[ptscotch],[-lptscotch -lptscotcherr],[]],
  	[[metis],[-lscotch -lmetis],[/usr/include/metis/metis.h],[]],
-diff -up freefem++-3.26-2/examples++-load/Makefile.am.r freefem++-3.26-2/examples++-load/Makefile.am
---- freefem++-3.26-2/examples++-load/Makefile.am.r	2013-11-20 21:39:10.000000000 +0100
-+++ freefem++-3.26-2/examples++-load/Makefile.am	2013-11-28 19:29:53.499142575 +0100
+diff -up serial/examples++-load/Makefile.am.r serial/examples++-load/Makefile.am
+--- serial/examples++-load/Makefile.am.r	2013-12-30 17:02:57.000000000 +0100
++++ serial/examples++-load/Makefile.am	2014-02-25 11:30:02.517777935 +0100
 @@ -71,7 +71,7 @@ LIST_COMPILE=myfunction.$(DYLIB_SUFFIX)
  
  # FFCS - some libraries are skipped because the corresponding tool is deactivated.
@@ -65,9 +75,9 @@ diff -up freefem++-3.26-2/examples++-load/Makefile.am.r freefem++-3.26-2/example
  	@TOOL_DYLIB_umfpack@ NewSolver.$(DYLIB_SUFFIX) @TOOL_DYLIB_lapack@ @TOOL_DYLIB_fflapack@		\
  	ffnewuoa.$(DYLIB_SUFFIX) ilut.$(DYLIB_SUFFIX) @TOOL_DYLIB_yams@ @TOOL_DYLIB_mmg3d@ @TOOL_DYLIB_mshmet@	\
  	@TOOL_DYLIB_gsl@ @TOOL_DYLIB_mumps_seq@ @TOOL_DYLIB_ipopt@ @TOOL_DYLIB_nlopt@ ff-cmaes.$(DYLIB_SUFFIX)	\
-diff -up freefem++-3.26-2/Makefile.am.r freefem++-3.26-2/Makefile.am
---- freefem++-3.26-2/Makefile.am.r	2013-11-20 16:36:23.000000000 +0100
-+++ freefem++-3.26-2/Makefile.am	2013-11-28 19:29:53.500142578 +0100
+diff -up serial/Makefile.am.r serial/Makefile.am
+--- serial/Makefile.am.r	2013-12-30 21:58:07.000000000 +0100
++++ serial/Makefile.am	2014-02-25 11:30:02.518777938 +0100
 @@ -36,7 +36,7 @@ examples++-3d/lac-leman-v4.msh \
  examples++-load/load.link \
  examples++-load/fig.pgm	examples++-load/lg.pgm \
@@ -96,9 +106,9 @@ diff -up freefem++-3.26-2/Makefile.am.r freefem++-3.26-2/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.26-2/src/lglib/Makefile.am.r freefem++-3.26-2/src/lglib/Makefile.am
---- freefem++-3.26-2/src/lglib/Makefile.am.r	2013-11-02 10:19:55.000000000 +0100
-+++ freefem++-3.26-2/src/lglib/Makefile.am	2013-11-28 19:29:53.500142578 +0100
+diff -up serial/src/lglib/Makefile.am.r serial/src/lglib/Makefile.am
+--- serial/src/lglib/Makefile.am.r	2013-11-02 10:19:55.000000000 +0100
++++ serial/src/lglib/Makefile.am	2014-02-25 11:30:02.518777938 +0100
 @@ -11,9 +11,9 @@ BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
  # machine (the danger is to generate unnecessary version conflicts) on these automatically generated files
  
diff --git a/freefem++.spec b/freefem++.spec
index 7913645..70d5daf 100644
--- a/freefem++.spec
+++ b/freefem++.spec
@@ -4,7 +4,7 @@
 Summary: PDE solving tool
 Name: freefem++
 Version: 3.27
-Release: 2%{dotpl}%{?dist}
+Release: 3%{dotpl}%{?dist}
 URL: http://www.freefem.org/ff++/index.htm
 Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}%{dashpl}.tar.gz
 Source1: FreeFem++.1
@@ -35,7 +35,7 @@ BuildRequires:	libXxf86vm-devel
 #scotch package is broken
 #BuildRequires:	scotch-devel
 BuildRequires:	suitesparse-devel
-#BuildRequires:	superlu-devel
+BuildRequires:	SuperLU-devel
 %{?_with_tetgen:BuildRequires:	tetgen-devel}
 BuildRequires:	texlive-multirow
 BuildRequires:	texlive-was
@@ -133,8 +133,6 @@ pushd serial
 	--disable-parmetis \
 	--disable-pastix \
 	--disable-scotch \
-	--disable-superlu \
-	--disable-superludist \
 	--disable-tetgen \
 	--disable-yams \
 	--enable-opengl \
@@ -161,8 +159,6 @@ pushd openmpi
 	--disable-parmetis \
 	--disable-pastix \
 	--disable-scotch \
-	--disable-superlu \
-	--disable-superludist \
 	--disable-tetgen \
 	--disable-yams \
 	--enable-opengl \
@@ -191,8 +187,6 @@ pushd mpich
 	--disable-parmetis \
 	--disable-pastix \
 	--disable-scotch \
-	--disable-superlu \
-	--disable-superludist \
 	--disable-tetgen \
 	--disable-yams \
 	--enable-opengl \
@@ -266,6 +260,9 @@ popd
 %{_libdir}/mpich/lib/ff++
 
 %changelog
+* Tue Feb 25 2014 Dominik Mierzejewski <rpm at greysector.net> 3.27-3
+- fix compilation and build against SuperLU
+
 * Sun Feb 23 2014 Dominik Mierzejewski <rpm at greysector.net> 3.27-2
 - rebuild for mpich-3.1
 
