View | Details | Raw Unified | Return to bug 151867 | Differences between
and this patch

Collapse All | Expand All

(-)french/aster/Makefile (-3 / +5 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=		aster
8
PORTNAME=		aster
9
DISTVERSION=		${ASTER_DISTVERSION}
9
DISTVERSION=		${ASTER_DISTVERSION}
10
PORTREVISION=		1
10
CATEGORIES=		french cad
11
CATEGORIES=		french cad
11
12
12
MAINTAINER=	thierry@FreeBSD.org
13
MAINTAINER=	thierry@FreeBSD.org
Lines 131-143 Link Here
131
BUILD_DEPENDS+=	${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs	\
132
BUILD_DEPENDS+=	${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs	\
132
		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
133
		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
133
MUMPS_PORT=	mumps-mpich
134
MUMPS_PORT=	mumps-mpich
134
MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/lib -lmpich
135
MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/lib -lmpich -lmpl
135
. endif
136
. endif
136
BUILD_DEPENDS+=	${LOCALBASE}/lib/libcmumps.a:${PORTSDIR}/math/${MUMPS_PORT}
137
BUILD_DEPENDS+=	${LOCALBASE}/lib/libcmumps.a:${PORTSDIR}/math/${MUMPS_PORT}
137
.endif
138
.endif
138
139
139
.if defined(WITH_MPI)
140
.if defined(WITH_MPI)
140
BUILD_DEPENDS+=	${HOME_MPI}/include/mpif.h:${PORTSDIR}/net/mpich2
141
LIB_DEPENDS+=	mpich.2:${PORTSDIR}/net/mpich2
141
HOME_MPI=	${LOCALBASE}
142
HOME_MPI=	${LOCALBASE}
142
.endif
143
.endif
143
144
Lines 220-226 Link Here
220
221
221
pre-everything::
222
pre-everything::
222
.if defined(WITH_MPI)
223
.if defined(WITH_MPI)
223
	@${ECHO_MSG} "To build Code_Aster with MPI enabled, you need to run `mpd &'"
224
	@${ECHO_MSG} "To build Code_Aster with MPI enabled, you need to run \`mpd &'"
224
.endif
225
.endif
225
226
226
pre-configure:
227
pre-configure:
Lines 337-342 Link Here
337
	${ECHO_CMD} "#?vers : VVV?" >> ${WRKSRC}/instdir/etc/codeaster/aster
338
	${ECHO_CMD} "#?vers : VVV?" >> ${WRKSRC}/instdir/etc/codeaster/aster
338
	${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin		\
339
	${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin		\
339
		${LOCALBASE}/aster/ASTK/ASTK_SERV/asrun		\
340
		${LOCALBASE}/aster/ASTK/ASTK_SERV/asrun		\
341
		${LOCALBASE}/aster/ASTK/ASTK_SERV/share		\
340
		${WRKSRC}/instdir/
342
		${WRKSRC}/instdir/
341
	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${WRKSRC}/instdir|'	\
343
	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${WRKSRC}/instdir|'	\
342
		${WRKSRC}/instdir/bin/as_run
344
		${WRKSRC}/instdir/bin/as_run
(-)french/aster/files/patch-products.py (-3 / +3 lines)
Lines 1-5 Link Here
1
--- products.py.orig	2010-07-07 18:18:13.000000000 +0200
1
--- products.py.orig	2010-09-14 10:48:26.000000000 +0200
2
+++ products.py	2010-08-12 19:08:43.000000000 +0200
2
+++ products.py	2010-10-25 22:53:13.000000000 +0200
3
@@ -907,16 +907,19 @@
3
@@ -907,16 +907,19 @@
4
            'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB',
4
            'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB',
5
            'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS',
5
            'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS',
Lines 40-46 Link Here
40
+      opt['FINCLUDE']   = ''
40
+      opt['FINCLUDE']   = ''
41
+      cxxlibs.extend(['stdc++', 'supc++'])
41
+      cxxlibs.extend(['stdc++', 'supc++'])
42
+      zmat_platform=''
42
+      zmat_platform=''
43
+      mpilibs.extend(['mpich'])
43
+      mpilibs.extend(['mpich', 'mpl'])
44
    elif cfg['IFDEF'] == 'LINUX64':
44
    elif cfg['IFDEF'] == 'LINUX64':
45
       opt['SYSLIB']     = '-Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm'
45
       opt['SYSLIB']     = '-Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm'
46
       opt['LDFLAGS']    = '-v'
46
       opt['LDFLAGS']    = '-v'

Return to bug 151867