[wip/mumps] Fix compilation

- Fix patch-ab for the F_ARITH_SYMBOL definition
- Add patch-ac fixing mumps_elapse symbol name definition
- Suffix libraries with _seq, as we build only the sequential version (no MPI).
- Add version tag to dso
- Require gcc-fortran>=4 (f90 compiler).

mumps/Makefile

@@ -27,6 +27,9 @@ LIBRARY_DIRS.blas=	lib
 RPATH_DIRS.blas=	lib
 LDFLAGS.blas=		-lblas
 
+# require f90 compiler
+DEPEND_ABI.gcc-fortran+=	gcc-fortran>=4
+
 include ../../math/lapack/depend.mk
 include ../../math/blas/depend.mk
 include ../../mk/sysdep/autoconf.mk

mumps/PLIST

@@ -13,11 +13,11 @@ include/mumps/smumps_struc.h
 include/mumps/zmumps_c.h
 include/mumps/zmumps_root.h
 include/mumps/zmumps_struc.h
-lib/libcmumps.la
-lib/libdmumps.la
-lib/libmumps_common.la
-lib/libsmumps.la
-lib/libzmumps.la
+lib/libcmumps_seq.la
+lib/libdmumps_seq.la
+lib/libmumps_common_seq.la
+lib/libsmumps_seq.la
+lib/libzmumps_seq.la
 share/mumps/ChangeLog
 share/mumps/LICENSE
 share/mumps/README

mumps/depend.mk

@@ -21,7 +21,7 @@ SYSTEM_SEARCH.mumps=\
   'include/mumps/dmumps_c.h:/MUMPS_VERSION.*"[0-9.]*"/s/[^0-9.]//gp'	\
   'lib/lib{s,d,c,z}mumps.{so,a}'
 
-SYSTEM_PKG.Ubuntu.mumps=libmumps-dev
+SYSTEM_PKG.Ubuntu.mumps=libmumps-seq-dev
 
 endif # MUMPS_DEPEND_MK ----------------------------------------------------
 

mumps/distinfo

@@ -2,4 +2,5 @@ SHA1 (MUMPS_4.10.0.tar.gz) = 904b1d816272d99f1f53913cbd4789a5be1838f7
 RMD160 (MUMPS_4.10.0.tar.gz) = 19ae1f4773ab1643237f791085d9721932a618fc
 Size (MUMPS_4.10.0.tar.gz) = 2481516 bytes
 SHA1 (patch-aa) = ec047ce693541de6e92a4c79980daf4d5283b1c0
-SHA1 (patch-ab) = 723797b6add1d9d53e67a61773eff752b6226ebf
+SHA1 (patch-ab) = 92a0176707f4afd0f1a59c8b875954df7184924e
+SHA1 (patch-ac) = 5efcbe62eff3428e061f54ef123c6e92a4e7973c

mumps/files/Makefile.am

@@ -2,11 +2,11 @@
 
 AM_CPPFLAGS=	-IMUMPS/include -IMUMPS/libseq
 
-lib_LTLIBRARIES= libmumps_common.la
-lib_LTLIBRARIES+= libsmumps.la
-lib_LTLIBRARIES+= libdmumps.la
-lib_LTLIBRARIES+= libcmumps.la
-lib_LTLIBRARIES+= libzmumps.la
+lib_LTLIBRARIES= libmumps_common_seq.la
+lib_LTLIBRARIES+= libsmumps_seq.la
+lib_LTLIBRARIES+= libdmumps_seq.la
+lib_LTLIBRARIES+= libcmumps_seq.la
+lib_LTLIBRARIES+= libzmumps_seq.la
 
 docdir=		${datadir}/mumps
 doc_DATA=\
@@ -36,7 +36,7 @@ mumps_HEADERS=\
 	MUMPS/include/zmumps_root.h		\
 	MUMPS/include/zmumps_struc.h
 
-libmumps_common_la_SOURCES=\
+libmumps_common_seq_la_SOURCES=\
 	MUMPS/src/mumps_part9.F			\
 	MUMPS/src/mumps_common.c		\
 	MUMPS/src/mumps_ooc_common.F		\
@@ -53,9 +53,10 @@ libmumps_common_la_SOURCES=\
 	MUMPS/libseq/mpi.f 			\
 	MUMPS/libseq/mpic.c			\
 	MUMPS/libseq/elapse.c
-libmumps_common_la_LIBADD=${FCLIBS}
+libmumps_common_seq_la_LIBADD=${FCLIBS}
+libmumps_common_seq_la_LDFLAGS=-release ${PACKAGE_VERSION}
 
-libsmumps_la_SOURCES=\
+libsmumps_seq_la_SOURCES=\
 	MUMPS/src/smumps_part1.F		\
         MUMPS/src/smumps_part2.F		\
         MUMPS/src/smumps_part3.F		\
@@ -70,7 +71,8 @@ libsmumps_la_SOURCES=\
         MUMPS/src/smumps_ooc_buffer.F		\
         MUMPS/src/smumps_ooc.F			\
         MUMPS/src/smumps_struc_def.F
-libsmumps_la_LIBADD=libmumps_common.la
+libsmumps_seq_la_LIBADD=libmumps_common_seq.la
+libsmumps_seq_la_LDFLAGS=-release ${PACKAGE_VERSION}
 
 smumps_part1.lo smumps_part2.lo: smumps_load.lo smumps_ooc.lo
 smumps_part3.lo smumps_part4.lo: smumps_load.lo smumps_ooc.lo
@@ -81,7 +83,7 @@ smumps_ooc.lo smumps_load.lo: smumps_comm_buffer.lo
 smumps_ooc.lo smumps_load.lo: smumps_struc_def.lo
 smumps_ooc.lo smumps_load.lo: smumps_ooc_buffer.lo
 
-libdmumps_la_SOURCES=\
+libdmumps_seq_la_SOURCES=\
 	MUMPS/src/dmumps_part1.F		\
         MUMPS/src/dmumps_part2.F		\
         MUMPS/src/dmumps_part3.F		\
@@ -96,7 +98,8 @@ libdmumps_la_SOURCES=\
         MUMPS/src/dmumps_ooc_buffer.F		\
         MUMPS/src/dmumps_ooc.F			\
         MUMPS/src/dmumps_struc_def.F
-libdmumps_la_LIBADD=libmumps_common.la
+libdmumps_seq_la_LIBADD=libmumps_common_seq.la
+libdmumps_seq_la_LDFLAGS=-release ${PACKAGE_VERSION}
 
 dmumps_part1.lo dmumps_part2.lo: dmumps_load.lo dmumps_ooc.lo
 dmumps_part3.lo dmumps_part4.lo: dmumps_load.lo dmumps_ooc.lo
@@ -107,7 +110,7 @@ dmumps_ooc.lo dmumps_load.lo: dmumps_comm_buffer.lo
 dmumps_ooc.lo dmumps_load.lo: dmumps_struc_def.lo
 dmumps_ooc.lo dmumps_load.lo: dmumps_ooc_buffer.lo
 
-libcmumps_la_SOURCES=\
+libcmumps_seq_la_SOURCES=\
 	MUMPS/src/cmumps_part1.F		\
         MUMPS/src/cmumps_part2.F		\
         MUMPS/src/cmumps_part3.F		\
@@ -122,7 +125,8 @@ libcmumps_la_SOURCES=\
         MUMPS/src/cmumps_ooc_buffer.F		\
         MUMPS/src/cmumps_ooc.F			\
         MUMPS/src/cmumps_struc_def.F
-libcmumps_la_LIBADD=libmumps_common.la
+libcmumps_seq_la_LIBADD=libmumps_common_seq.la
+libcmumps_seq_la_LDFLAGS=-release ${PACKAGE_VERSION}
 
 cmumps_part1.lo cmumps_part2.lo: cmumps_load.lo cmumps_ooc.lo
 cmumps_part3.lo cmumps_part4.lo: cmumps_load.lo cmumps_ooc.lo
@@ -133,7 +137,7 @@ cmumps_ooc.lo cmumps_load.lo: cmumps_comm_buffer.lo
 cmumps_ooc.lo cmumps_load.lo: cmumps_struc_def.lo
 cmumps_ooc.lo cmumps_load.lo: cmumps_ooc_buffer.lo
 
-libzmumps_la_SOURCES=\
+libzmumps_seq_la_SOURCES=\
 	MUMPS/src/zmumps_part1.F		\
         MUMPS/src/zmumps_part2.F		\
         MUMPS/src/zmumps_part3.F		\
@@ -148,7 +152,8 @@ libzmumps_la_SOURCES=\
         MUMPS/src/zmumps_ooc_buffer.F		\
         MUMPS/src/zmumps_ooc.F			\
         MUMPS/src/zmumps_struc_def.F
-libzmumps_la_LIBADD=libmumps_common.la
+libzmumps_seq_la_LIBADD=libmumps_common_seq.la
+libzmumps_seq_la_LDFLAGS=-release ${PACKAGE_VERSION}
 
 zmumps_part1.lo zmumps_part2.lo: zmumps_load.lo zmumps_ooc.lo
 zmumps_part3.lo zmumps_part4.lo: zmumps_load.lo zmumps_ooc.lo
@@ -159,7 +164,8 @@ zmumps_ooc.lo zmumps_load.lo: zmumps_comm_buffer.lo
 zmumps_ooc.lo zmumps_load.lo: zmumps_struc_def.lo
 zmumps_ooc.lo zmumps_load.lo: zmumps_ooc_buffer.lo
 
-libsmumps.la libdmumps.la libcmumps.la libzmumps.la: libmumps_common.la
+libsmumps_seq.la libdmumps_seq.la libcmumps_seq.la libzmumps_seq.la: \
+	libmumps_common_seq.la
 MUMPS/src/%mumps_c.c: MUMPS/src/mumps_c.c
 	echo '#define MUMPS_ARITH MUMPS_ARITH_$*' >$@
 	${SED} -e '' $< >>$@

mumps/files/configure.ac

 # autoconf script for MUMPS
 
 AC_PREREQ(2.62)
-AC_INIT([mumps],[@VERSION@],[openrobots@laas.fr])
+AC_INIT([mumps],[@VERSION@])
 
 AC_CONFIG_SRCDIR([MUMPS/src/dmumps_part1.F])
 AM_INIT_AUTOMAKE([foreign no-define])

mumps/patches/patch-ab

@@ -5,16 +5,16 @@
   */
  #if MUMPS_ARITH == MUMPS_ARITH_s
 +# define F_SYM_ARITH(lower_case,upper_case) \
-+  F_SYMBOL(s ## lower_case, S ## upper_case)
++  FC_FUNC(smumps_ ## lower_case, SMUMPS_ ## upper_case)
 +#elif MUMPS_ARITH == MUMPS_ARITH_d
 +# define F_SYM_ARITH(lower_case,upper_case) \
-+  F_SYMBOL(d ## lower_case, D ## upper_case)
++  FC_FUNC(dmumps_ ## lower_case, DMUMPS_ ## upper_case)
 +#elif MUMPS_ARITH == MUMPS_ARITH_c
 +# define F_SYM_ARITH(lower_case,upper_case) \
-+  F_SYMBOL(c ## lower_case, C ## upper_case)
++  FC_FUNC(cmumps_ ## lower_case, CMUMPS_ ## upper_case)
 +#elif MUMPS_ARITH == MUMPS_ARITH_z
 +# define F_SYM_ARITH(lower_case,upper_case) \
-+  F_SYMBOL(z ## lower_case, Z ## upper_case)
++  FC_FUNC(zmumps_ ## lower_case, ZMUMPS_ ## upper_case)
 +#endif
 +#if 0
 +#if MUMPS_ARITH == MUMPS_ARITH_s

mumps/patches/patch-ac

+--- MUMPS/libseq/elapse.h~	2011-05-10 14:56:39.000000000 +0200
++++ MUMPS/libseq/elapse.h	2012-03-09 11:07:51.047255368 +0100
+@@ -59,6 +59,8 @@
+ #endif
+ #endif
+ 
++#define mumps_elapse FC_FUNC(mumps_elapse, MUMPS_ELAPSE)
++#if 0
+ #if (defined(_WIN32) && ! defined(__MINGW32__)) || defined(UPPER)
+ #define mumps_elapse MUMPS_ELAPSE
+ #elif defined(Add__)
+@@ -66,5 +68,6 @@
+ #elif defined(Add_)
+ #define mumps_elapse mumps_elapse_
+ #endif
++#endif
+ 
+ void MUMPS_CALL mumps_elapse(double *val);