Attachment 153869 Details for Bug 196577 – elmerfem update 20150305

[patch] elmerfem update 20150305

cad-elmerfem.diff (text/plain), 5.63 KB, created by Pedro F. Giffuni on 2015-03-05 21:25:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2015-03-05 21:25:12 UTC

Size: 5.63 KB

patch

obsolete

>Index: cad/elmerfem/Makefile
>===================================================================
>--- cad/elmerfem/Makefile	(revision 380550)
>+++ cad/elmerfem/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	elmerfem
>-PORTVERSION=	7.0.20141202
>+PORTVERSION=	7.0.20150305
> CATEGORIES=	cad science
> 
> MAINTAINER=	pfg@FreeBSD.org
>@@ -10,8 +10,7 @@
> 
> LICENSE=	GPLv2
> 
>-LIB_DEPENDS=	liblapack.so:${PORTSDIR}/math/lapack		\
>-		libparpack.so:${PORTSDIR}/math/arpack-ng-mpich	\
>+LIB_DEPENDS=	libparpack.so:${PORTSDIR}/math/arpack-ng-mpich	\
> 		libmpich.so.8:${PORTSDIR}/net/mpich2
> 
> USE_GITHUB=	yes
>@@ -18,9 +17,9 @@
> GH_ACCOUNT=	ElmerCSC
> GH_PROJECT=	elmerfem
> GH_TAGNAME=	${GH_COMMIT}
>-GH_COMMIT=	0300707
>+GH_COMMIT=	799ecc8
> 
>-USES=		cmake fortran gmake tcl
>+USES=		cmake fortran gmake tcl blaslapack:netlib
> 
> USE_LDCONFIG=	yes
> ALL_TARGET=
>Index: cad/elmerfem/distinfo
>===================================================================
>--- cad/elmerfem/distinfo	(revision 380550)
>+++ cad/elmerfem/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (elmerfem-7.0.20141202.tar.gz) = f42a395ad021425ffb6bc8f513682d402c5ee31dfc45aed77b377a141f376a2b
>-SIZE (elmerfem-7.0.20141202.tar.gz) = 43339062
>+SHA256 (elmerfem-7.0.20150305.tar.gz) = 6299fffa71e3b868abe30df5c85704e60309ae171321a6aa9fb61bb061cfd32c
>+SIZE (elmerfem-7.0.20150305.tar.gz) = 44839317
>Index: cad/elmerfem/files/patch-fem_src_CMakeLists.txt
>===================================================================
>--- cad/elmerfem/files/patch-fem_src_CMakeLists.txt	(revision 380550)
>+++ cad/elmerfem/files/patch-fem_src_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- fem/src/CMakeLists.txt.orig	2014-09-25 15:07:43.000000000 +0200
>-+++ fem/src/CMakeLists.txt	2014-10-06 23:29:26.000000000 +0200
>-@@ -117,9 +117,9 @@
>+--- fem/src/CMakeLists.txt.orig	2014-12-18 03:11:20.000000000 -0500
>++++ fem/src/CMakeLists.txt	2015-01-06 15:46:33.994140478 -0500
>+@@ -119,9 +119,9 @@
>  
>  
>  ADD_EXECUTABLE(Solver_TGT Solver.F90)
>@@ -12,7 +12,7 @@
>  ENDIF()
>  
>  IF(NOT(WITH_MPI))
>-@@ -214,7 +214,7 @@
>+@@ -216,7 +216,7 @@
>  INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
>  
>  IF(NOT(WIN32))
>@@ -21,7 +21,7 @@
>  ENDIF()
>  
>  # GebhardFactors
>-@@ -223,7 +223,7 @@
>+@@ -225,7 +225,7 @@
>                                        mpi_stubs elmersolver)
>  
>  IF(NOT(WIN32))
>@@ -30,17 +30,17 @@
>  ENDIF()
>  
>  IF(WITH_Trilinos)
>-@@ -267,9 +267,10 @@
>+@@ -269,9 +269,10 @@
>  
>  IF(WITH_MPI)
>    IF(NOT(WIN32))
>--    INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink
>--    \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi
>--    \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)")
>-+    # Create symlink after, to repect STAGEDIR
>-+    #INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink
>-+    #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi
>-+    #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)")
>+-    INSTALL(CODE "
>+-    EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver
>+-    WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)")
>++    # Create symlink after, to respect STAGEDIR
>++    #INSTALL(CODE "
>++    #EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver
>++    #WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)")
>    ELSE()
>      INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy
>      \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe
>Index: cad/elmerfem/pkg-plist
>===================================================================
>--- cad/elmerfem/pkg-plist	(revision 380550)
>+++ cad/elmerfem/pkg-plist	(working copy)
>@@ -126,6 +126,7 @@
> share/elmersolver/lib/FlowSolve.so
> share/elmersolver/lib/FluidicForce.so
> share/elmersolver/lib/FluxSolver.so
>+share/elmersolver/lib/FourierLoss.so
> share/elmersolver/lib/FreeSurfaceReduced.so
> share/elmersolver/lib/FreeSurfaceSolver.so
> share/elmersolver/lib/HeatSolve.so
>@@ -164,6 +165,7 @@
> share/elmersolver/lib/SSTKomega.so
> share/elmersolver/lib/SaveData.so
> share/elmersolver/lib/SaveGridData.so
>+share/elmersolver/lib/SaveMesh.so
> share/elmersolver/lib/ScalarPotentialSolver.so
> share/elmersolver/lib/ShallowWaterNS.so
> share/elmersolver/lib/ShearrateSolver.so
>@@ -188,6 +190,7 @@
> share/elmersolver/lib/VelocityPrecond.so
> share/elmersolver/lib/ViscousCompressibility.so
> share/elmersolver/lib/VorticitySolver.so
>+share/elmersolver/lib/WaveSolver.so
> share/elmersolver/lib/elements.def
> share/elmersolver/license_texts/GPL-2.txt
> share/elmersolver/license_texts/LGPL-2.1.txt
>Index: math/arpack-ng/Makefile
>===================================================================
>--- math/arpack-ng/Makefile	(revision 380550)
>+++ math/arpack-ng/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> 
> LICENSE=	BSD3CLAUSE
> 
>-USES=		fortran libtool
>+USES=		fortran libtool blaslapack
> USE_LDCONFIG=	yes
> 
> CONFLICTS=	arpack-[0-9]*
>@@ -22,8 +22,8 @@
> 
> GNU_CONFIGURE=	yes
> 
>-CONFIGURE_ARGS=	--with-blas="${BLAS}" \
>-		--with-lapack="${LAPACK}"
>+CONFIGURE_ARGS=	--with-blas="${BLASLIB}" \
>+		--with-lapack="${LAPACKLIB}"
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
> WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
>@@ -41,25 +41,6 @@
> PKGNAMESUFFIX=	-mpich
> .endif
> 
>-WITH_BLAS?=	blas
>-
>-.if ${WITH_BLAS} == "gotoblas"
>-BLAS=		-lgoto2p
>-LAPACK=		-lgoto2p
>-LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
>-.elif ${WITH_BLAS} == "atlas"
>-BLAS=		-lptf77blas
>-LAPACK=		-lalapack -lptcblas
>-LIB_DEPENDS+=	libptf77blas.so:${PORTSDIR}/math/atlas
>-.elif ${WITH_BLAS} == "blas"
>-BLAS=		-lblas
>-LAPACK=		-llapack
>-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
>-		liblapack.so:${PORTSDIR}/math/lapack
>-.else
>-IGNORE=		unknown value of WITH_BLAS: ${WITH_BLAS}
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -Ee 's|$libdir$(/pkgconfig)|(prefix)/libdata\1|' \
> 	${WRKSRC}/Makefile.in

Actions: View | Diff

Attachments on bug 196577: 151433 | 153869 | 156227 | 156517 | 157814 | 157815 | 158228 | 158232 | 160223 | 160880 | 165133 | 168047