Attachment 175237 Details for Bug 212464 – patch - multithreads with cpp change reverted

[patch] patch - multithreads with cpp change reverted

science-mbdyn.diff (text/plain), 7.17 KB, created by Pedro F. Giffuni on 2016-09-28 21:02:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2016-09-28 21:02:36 UTC

Size: 7.17 KB

patch

obsolete

>Index: science/mbdyn/Makefile
>===================================================================
>--- science/mbdyn/Makefile	(revision 422881)
>+++ science/mbdyn/Makefile	(working copy)
>@@ -2,10 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	mbdyn
>-PORTVERSION=	1.4.3
>-PORTREVISION=	1
>+PORTVERSION=	1.7.1
> CATEGORIES=	science
>-MASTER_SITES=	http://www.aero.polimi.it/~masarati/Download/mbdyn/
>+MASTER_SITES=	https://www.mbdyn.org/userfiles/downloads/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	MultiBody Dynamics analysis system
>@@ -12,11 +11,12 @@
> 
> LICENSE=	GPLv2
> 
>-LIB_DEPENDS=	libarpack.so:math/arpack \
>+LIB_DEPENDS=	libltdl.so:devel/libltdl \
>+		libarpack.so:math/arpack \
> 		libumfpack.so:math/suitesparse
> 
> GNU_CONFIGURE=	yes
>-USES=		fortran gmake libtool
>+USES=		fortran compiler:c++11-lib gmake libtool
> USE_LDCONFIG=	yes
> CPPFLAGS+=	-fpermissive -I${LOCALBASE}/include/suitesparse
> LDFLAGS+=	-L${LOCALBASE}/lib
>@@ -23,12 +23,11 @@
> CONFIGURE_ARGS+=	--program-prefix=''
> INSTALL_TARGET=	install-strip
> 
>-OPTIONS_DEFINE=	MPI METIS CHACO GINAC TCL
>-MPI_DESC=	Enable mpich-support
>+OPTIONS_DEFINE=	MPI METIS CHACO GINAC
>+MPI_DESC=	Enable mpich-support (Requires Metis or Chaco, broken)
> METIS_DESC=	Enable metis-support
> CHACO_DESC=	Enable chaco-support
> GINAC_DESC=	Enable GiNaC-support (not implemented yet)
>-TCL_DESC=	Enable tcl-support (not implemented yet)
> OPTIONS_RADIO=	BLAS
> OPTIONS_RADIO_BLAS=	REFERENCE GOTOBLAS ATLAS
> OPTIONS_DEFAULT=	REFERENCE
>@@ -45,6 +44,8 @@
> GOTOBLAS_USES=	blaslapack:gotoblas
> GOTOBLAS_CONFIGURE_ON=	--with-blas=goto --with-goto=goto2
> 
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == "powerpc"
>@@ -52,14 +53,15 @@
> .endif
> 
> .if ${PORT_OPTIONS:MMPI}
>+IGNORE=		you enabled MPI support, which is broken
> LIB_DEPENDS+=	libmpich.so:net/mpich2
> CONFIGURE_ARGS+=	--with-mpi=yes --enable-schur
>-CPPFLAGS+=	-I${LOCALBASE}/include
> . if ! ${PORT_OPTIONS:MMETIS}
> WITH_CHACO=	yes
> . endif
> .else
>-CONFIGURE_ARGS+=	--with-mpi=no
>+BUILD_DEPENDS+= ${LOCALBASE}/include/atomic_ops.h:devel/libatomic_ops
>+CONFIGURE_ARGS+=	--with-mpi=no --enable-multithread
> .endif
> 
> .if ${PORT_OPTIONS:MMETIS}
>@@ -78,6 +80,7 @@
> .endif
> 
> .if ${PORT_OPTIONS:MGINAC}
>+IGNORE=		you enabled GiNaC-support, which is broken
> LIB_DEPENDS+=	libmetis.so:math/metis4 \
> 		libginac.so:math/GiNaC
> CONFIGURE_ARGS+=	--with-ginac=yes
>@@ -86,15 +89,6 @@
> CONFIGURE_ARGS+=	--with-ginac=no
> .endif
> 
>-.if ${PORT_OPTIONS:MTCL}
>-IGNORE=		you enabled Tcl-support, which is not implemented yet
>-LIB_DEPENDS+=	libtcl84.so:lang/tcl84
>-CONFIGURE_ARGS+=	--with-tcl=yes
>-CPPFLAGS+=	-I${LOCALBASE}/include/tcl8.4
>-.else
>-CONFIGURE_ARGS+=	--with-tcl=no
>-.endif
>-
> pre-configure:
> 	${REINPLACE_CMD} -e '/try_lapack_LIBS=/s/-llapack/${LAPACKLIB}/' \
> 		-e 's/ -lxerbla//; s/-lcholmod/-lcholmod ${BLASLIB} ${LAPACKLIB} -lsuitesparseconfig/'	\
>Index: science/mbdyn/distinfo
>===================================================================
>--- science/mbdyn/distinfo	(revision 422881)
>+++ science/mbdyn/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (mbdyn-1.4.3.tar.gz) = 24c37a2802b2842ec6cbfc7ffeb20af4ca49e12102d75a6966e93fd99d26d117
>-SIZE (mbdyn-1.4.3.tar.gz) = 2320156
>+TIMESTAMP = 1473272629
>+SHA256 (mbdyn-1.7.1.tar.gz) = 2c1f21a6459c58103778cb5d771fc49f972baaa57866329ecd1e90dcf04b4ccf
>+SIZE (mbdyn-1.7.1.tar.gz) = 2834562
>Index: science/mbdyn/files/patch-include__ac__mpi.h
>===================================================================
>--- science/mbdyn/files/patch-include__ac__mpi.h	(revision 422881)
>+++ science/mbdyn/files/patch-include__ac__mpi.h	(working copy)
>@@ -1,5 +1,5 @@
>---- ./include/ac/mpi.h.orig	2009-01-04 19:04:54.000000000 +0100
>-+++ ./include/ac/mpi.h	2010-10-31 22:31:57.000000000 +0100
>+--- include/ac/mpi.h.orig	2015-10-30 05:05:33 UTC
>++++ include/ac/mpi.h
> @@ -35,7 +35,7 @@
>  #ifdef HAVE_MPI___H
>  #include <mpi++.h>
>Index: science/mbdyn/files/patch-mbdyn__base__invsolver.cc
>===================================================================
>--- science/mbdyn/files/patch-mbdyn__base__invsolver.cc	(revision 422881)
>+++ science/mbdyn/files/patch-mbdyn__base__invsolver.cc	(working copy)
>@@ -1,7 +1,7 @@
>---- ./mbdyn/base/invsolver.cc.orig	2009-04-10 13:25:00.000000000 +0200
>-+++ ./mbdyn/base/invsolver.cc	2010-10-31 23:14:49.000000000 +0100
>-@@ -200,8 +200,8 @@
>- 		}
>+--- 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
>@@ -8,5 +8,5 @@
>  	int mpi_finalize = 0;
> +#ifdef USE_SCHUR
>  
>- 	int MyRank = 0;
>  	if (bParallel) {
>+ 		DEBUGLCOUT(MYDEBUG_MEM, "creating parallel SchurDataManager"
>Index: science/mbdyn/files/patch-mbdyn__base__solver.cc
>===================================================================
>--- science/mbdyn/files/patch-mbdyn__base__solver.cc	(revision 422881)
>+++ science/mbdyn/files/patch-mbdyn__base__solver.cc	(working copy)
>@@ -1,6 +1,6 @@
>---- mbdyn/base/solver.cc.orig	2011-06-20 14:55:12.000000000 -0400
>-+++ mbdyn/base/solver.cc	2011-08-26 05:08:45.000000000 -0400
>-@@ -111,10 +111,17 @@
>+--- mbdyn/base/solver.cc.orig	2016-04-24 19:10:43 UTC
>++++ mbdyn/base/solver.cc
>+@@ -109,10 +109,17 @@ enum {
>  };
>  
>  volatile sig_atomic_t mbdyn_keep_going = MBDYN_KEEP_GOING;
>@@ -18,7 +18,7 @@
>  
>  extern "C" void
>  mbdyn_really_exit_handler(int signum)
>-@@ -202,7 +209,11 @@
>+@@ -200,7 +207,11 @@ extern "C" void
>  mbdyn_signal_init(int pre)
>  {
>  #ifdef HAVE_SIGNAL
>@@ -30,8 +30,8 @@
>  	if (pre) {
>  		hdl = mbdyn_really_exit_handler;
>  
>-@@ -464,8 +475,8 @@
>- 		}
>+@@ -406,8 +417,8 @@ Solver::Prepare(void)
>+ 		pRTSolver->Setup();
>  	}
>  
> -#ifdef USE_SCHUR
>@@ -38,5 +38,5 @@
>  	int mpi_finalize = 0;
> +#ifdef USE_SCHUR
>  
>- 	int MyRank = 0;
>  	if (bParallel) {
>+ 		DEBUGLCOUT(MYDEBUG_MEM, "creating parallel SchurDataManager"
>Index: science/mbdyn/files/patch-mbdyn__mbdyn.h
>===================================================================
>--- science/mbdyn/files/patch-mbdyn__mbdyn.h	(revision 422881)
>+++ science/mbdyn/files/patch-mbdyn__mbdyn.h	(working copy)
>@@ -1,6 +1,6 @@
>---- mbdyn/mbdyn.h.orig	Thu Feb 10 11:51:26 2005
>-+++ mbdyn/mbdyn.h	Thu Feb 10 11:51:34 2005
>-@@ -49,6 +49,7 @@
>+--- mbdyn/mbdyn.h.orig	2015-10-30 05:05:37 UTC
>++++ mbdyn/mbdyn.h
>+@@ -50,6 +50,7 @@ typedef long int      Lint;
>  typedef double        Real;
>  
>  /* signal types */
>@@ -8,7 +8,7 @@
>  #ifdef HAVE_SIGNAL
>  #ifndef HAVE___SIGHANDLER_T
>  #ifndef HAVE_SIGHANDLER_T
>-@@ -58,6 +59,7 @@
>+@@ -59,6 +60,7 @@ typedef sighandler_t __sighandler_t;
>  #endif /* HAVE_SIGHANDLER_T */
>  #endif /* !HAVE___SIGHANDLER_T */
>  #endif /* HAVE_SIGNAL */
>Index: science/mbdyn/pkg-plist
>===================================================================
>--- science/mbdyn/pkg-plist	(revision 422881)
>+++ science/mbdyn/pkg-plist	(working copy)
>@@ -32,11 +32,18 @@
> lib/libmbc.so
> lib/libmbc.so.0
> lib/libmbc.so.0.0.0
>+man/man1/femgen.1.gz
> man/man1/mbdyn.1.gz
> share/Aster/cms.py
> share/awk/abs2rel.awk
> share/awk/mbdyn2easyanim.awk
> share/awk/mbdyn2pod.awk
>+share/awk/mbdyn_mov2ref.awk
>+share/awk/mbdyn_ref2log.awk
> share/awk/periodize.awk
> share/c81/naca0012.c81
>+share/octave/gradnorm.m
>+share/octave/mbdyn_derivative.m
> share/octave/pod.m
>+share/octave/rotation_increment_gibbs_rodriguez.m
>+share/octave/rotation_perturbation_matrix_gibbs_rodriguez.m

Actions: View | Diff

Attachments on bug 212464: 174485 | 174923 | 174924 | 175110 | 175208 | 175211 | 175213 | 175215 | 175237