Attachment #177624 for bug #215018




CONFIGURE_ARGS+=	--program-prefix=''
INSTALL_TARGET=	install-strip

OPTIONS_DEFINE=	METIS CHACO GINAC
OPTIONS_RADIO=	BLAS
OPTIONS_RADIO_BLAS=	REFERENCE GOTOBLAS ATLAS
OPTIONS_DEFAULT=	REFERENCE

GOTOBLAS_USES=	blaslapack:gotoblas
GOTOBLAS_CONFIGURE_ON=	--with-blas=goto --with-goto=goto2

CONFIGURE_ARGS+=	--enable-multithread
MPI_IGNORE=		you enabled MPI support, which is broken
MPI_BUILD_DEPENDS_OFF=	libatomic_ops>0:devel/libatomic_ops
MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
MPI_CONFIGURE_ON=	--with-mpi=yes --enable-schur
MPI_CONFIGURE_OFF=	--with-mpi=no --enable-multithread

METIS_DESC=		Enable metis-support
METIS_LIB_DEPENDS=	libmetis.so:math/metis4

CHACO_CONFIGURE_OFF=	--with-chaco=no

GINAC_DESC=		Enable GiNaC-support (not implemented yet)
GINAC_IGNORE=		you enabled GiNaC-support, which is broken
GINAC_LIB_DEPENDS=	libmetis.so:math/metis4 \
			libginac.so:math/GiNaC
GINAC_CONFIGURE_ON=	--with-ginac=yes

Lines 1-11 Link Here

(-)science/mbdyn/files/patch-include__ac__mpi.h (-11 lines)
1	--- include/ac/mpi.h.orig 2015-10-30 05:05:33 UTC
2	+++ include/ac/mpi.h
3	@@ -35,7 +35,7 @@
4	#ifdef HAVE_MPI___H
5	#include <mpi++.h>
6	#elif defined HAVE_MPICXX_H
7	-#include <mpicxx.h>
8	+#include <mpi.h>
9	#endif /* ! HAVE_MPI___H && ! HAVE_MPICXX_H */
10
11	#endif /* MPI_H */




--- mbdyn/base/invsolver.cc.orig	2016-04-24 19:10:43 UTC
+++ mbdyn/base/invsolver.cc
@@ -114,8 +114,8 @@ InverseSolver::Prepare(void)
 		pRTSolver->Setup();
 	}
 
-#ifdef USE_SCHUR
 	int mpi_finalize = 0;
+#ifdef USE_SCHUR
 
 	if (bParallel) {
 		DEBUGLCOUT(MYDEBUG_MEM, "creating parallel SchurDataManager"




 	if (pre) {
 		hdl = mbdyn_really_exit_handler;
 
@@ -406,8 +417,8 @@ Solver::Prepare(void)
 		pRTSolver->Setup();
 	}
 
-#ifdef USE_SCHUR
 	int mpi_finalize = 0;
+#ifdef USE_SCHUR
 
 	if (bParallel) {
 		DEBUGLCOUT(MYDEBUG_MEM, "creating parallel SchurDataManager"




--- mbdyn/mbdyn.h.orig	2015-10-30 05:05:37 UTC
+++ mbdyn/mbdyn.h
@@ -50,7 +50,7 @@ typedef long int      Lint;
 typedef double        Real;
 
 /* signal types */
-#ifdef HAVE_SIGNAL
+#if defined(HAVE_SIGNAL) && !defined(__FreeBSD__)
 #ifndef HAVE___SIGHANDLER_T
 #ifndef HAVE_SIGHANDLER_T
 typedef void (*__sighandler_t)(int);
 #endif /* HAVE_SIGHANDLER_T */
 #endif /* !HAVE___SIGHANDLER_T */
 #endif /* HAVE_SIGNAL */
+#endif
 
 /* sig_atomic_t */
 #ifndef HAVE_SIG_ATOMIC_T

Return to bug 215018

Lines 25-31 Link Here

(-)science/mbdyn/Makefile (-8 / +2 lines)
25	CONFIGURE_ARGS+= --program-prefix=''	25	CONFIGURE_ARGS+= --program-prefix=''
26	INSTALL_TARGET= install-strip	26	INSTALL_TARGET= install-strip
27		27
28	OPTIONS_DEFINE= MPI METIS CHACO GINAC	28	OPTIONS_DEFINE= METIS CHACO GINAC
29	OPTIONS_RADIO= BLAS	29	OPTIONS_RADIO= BLAS
30	OPTIONS_RADIO_BLAS= REFERENCE GOTOBLAS ATLAS	30	OPTIONS_RADIO_BLAS= REFERENCE GOTOBLAS ATLAS
31	OPTIONS_DEFAULT= REFERENCE	31	OPTIONS_DEFAULT= REFERENCE
Lines 42-53 Link Here
42	GOTOBLAS_USES= blaslapack:gotoblas	42	GOTOBLAS_USES= blaslapack:gotoblas
43	GOTOBLAS_CONFIGURE_ON= --with-blas=goto --with-goto=goto2	43	GOTOBLAS_CONFIGURE_ON= --with-blas=goto --with-goto=goto2
44		44
45	MPI_DESC= Enable mpich-support (Requires Metis or Chaco, broken)	45	CONFIGURE_ARGS+= --enable-multithread
46	MPI_IGNORE= you enabled MPI support, which is broken
47	MPI_BUILD_DEPENDS_OFF= libatomic_ops>0:devel/libatomic_ops
48	MPI_LIB_DEPENDS= libmpich.so:net/mpich2
49	MPI_CONFIGURE_ON= --with-mpi=yes --enable-schur
50	MPI_CONFIGURE_OFF= --with-mpi=no --enable-multithread
51		46
52	METIS_DESC= Enable metis-support	47	METIS_DESC= Enable metis-support
53	METIS_LIB_DEPENDS= libmetis.so:math/metis4	48	METIS_LIB_DEPENDS= libmetis.so:math/metis4
Lines 61-67 Link Here
61	CHACO_CONFIGURE_OFF= --with-chaco=no	56	CHACO_CONFIGURE_OFF= --with-chaco=no
62		57
63	GINAC_DESC= Enable GiNaC-support (not implemented yet)	58	GINAC_DESC= Enable GiNaC-support (not implemented yet)
64	GINAC_IGNORE= you enabled GiNaC-support, which is broken
65	GINAC_LIB_DEPENDS= libmetis.so:math/metis4 \	59	GINAC_LIB_DEPENDS= libmetis.so:math/metis4 \
66	libginac.so:math/GiNaC	60	libginac.so:math/GiNaC
67	GINAC_CONFIGURE_ON= --with-ginac=yes	61	GINAC_CONFIGURE_ON= --with-ginac=yes

Lines 1-12 Link Here

(-)science/mbdyn/files/patch-mbdyn__base__invsolver.cc (-12 lines)
1	--- mbdyn/base/invsolver.cc.orig 2016-04-24 19:10:43 UTC
2	+++ mbdyn/base/invsolver.cc
3	@@ -114,8 +114,8 @@ InverseSolver::Prepare(void)
4	pRTSolver->Setup();
5	}
6
7	-#ifdef USE_SCHUR
8	int mpi_finalize = 0;
9	+#ifdef USE_SCHUR
10
11	if (bParallel) {
12	DEBUGLCOUT(MYDEBUG_MEM, "creating parallel SchurDataManager"

Lines 30-42 Link Here

(-)science/mbdyn/files/patch-mbdyn__base__solver.cc (-10 lines)
30	if (pre) {	30	if (pre) {
31	hdl = mbdyn_really_exit_handler;	31	hdl = mbdyn_really_exit_handler;
32		32
33	@@ -406,8 +417,8 @@ Solver::Prepare(void)
34	pRTSolver->Setup();
35	}
36
37	-#ifdef USE_SCHUR
38	int mpi_finalize = 0;
39	+#ifdef USE_SCHUR
40
41	if (bParallel) {
42	DEBUGLCOUT(MYDEBUG_MEM, "creating parallel SchurDataManager"

Lines 1-18 Link Here

(-)science/mbdyn/files/patch-mbdyn__mbdyn.h (-11 / +4 lines)
1	--- mbdyn/mbdyn.h.orig 2015-10-30 05:05:37 UTC	1	--- mbdyn/mbdyn.h.orig 2015-10-30 05:05:37 UTC
2	+++ mbdyn/mbdyn.h	2	+++ mbdyn/mbdyn.h
3	@@ -50,6 +50,7 @@ typedef long int Lint;	3	@@ -50,7 +50,7 @@ typedef long int Lint;
4	typedef double Real;	4	typedef double Real;
5		5
6	/* signal types */	6	/* signal types */
7	+#if !defined(__FreeBSD__)	7	-#ifdef HAVE_SIGNAL
8	#ifdef HAVE_SIGNAL	8	+#if defined(HAVE_SIGNAL) && !defined(__FreeBSD__)
9	#ifndef HAVE___SIGHANDLER_T	9	#ifndef HAVE___SIGHANDLER_T
10	#ifndef HAVE_SIGHANDLER_T	10	#ifndef HAVE_SIGHANDLER_T
11	@@ -59,6 +60,7 @@ typedef sighandler_t __sighandler_t;	11	typedef void (*__sighandler_t)(int);
12	#endif /* HAVE_SIGHANDLER_T */
13	#endif /* !HAVE___SIGHANDLER_T */
14	#endif /* HAVE_SIGNAL */
15	+#endif
16
17	/* sig_atomic_t */
18	#ifndef HAVE_SIG_ATOMIC_T