Attachment 206442 Details for Bug 219669 – Update to version 4.3 (WIP)

[patch] Update to version 4.3 (WIP)

elmerfem-update.diff (text/plain), 6.50 KB, created by Pedro F. Giffuni on 2019-08-11 16:44:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2019-08-11 16:44:10 UTC

Size: 6.50 KB

patch

obsolete

>Index: cad/elmerfem/Makefile
>===================================================================
>--- cad/elmerfem/Makefile	(revision 508581)
>+++ cad/elmerfem/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	elmerfem
>-PORTVERSION=	8.3.20170524
>-PORTREVISION=	6
>+PORTVERSION=	8.4.g20181219
> CATEGORIES=	cad science
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -11,9 +10,6 @@
> 
> LICENSE=	GPLv2
> 
>-BROKEN=		fails to build
>-DEPRECATED=	Broken for more than 6 months
>-EXPIRATION_DATE=	2019-05-08
> 
> LIB_DEPENDS=	libparpack.so:math/arpack-ng \
> 		libmpich.so:net/mpich
>@@ -20,7 +16,7 @@
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	ElmerCSC
>-GH_TAGNAME=	release-8.3
>+GH_TAGNAME=	release-8.4
> 
> USES=		blaslapack:netlib cmake fortran gmake tcl
> 
>Index: cad/elmerfem/distinfo
>===================================================================
>--- cad/elmerfem/distinfo	(revision 508581)
>+++ cad/elmerfem/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1522698688
>-SHA256 (ElmerCSC-elmerfem-8.3.20170524-release-8.3_GH0.tar.gz) = 78aee1f7a364baf7dc26c738eb0e613e9b496e105a6ff88f48d0c281ec8c3cde
>-SIZE (ElmerCSC-elmerfem-8.3.20170524-release-8.3_GH0.tar.gz) = 57956283
>+TIMESTAMP = 1565060001
>+SHA256 (ElmerCSC-elmerfem-8.4.g20181219-release-8.4_GH0.tar.gz) = cc3ce807d76798361592cc14952cdc3db1ad8f9bac038017514033ce9badc5b3
>+SIZE (ElmerCSC-elmerfem-8.4.g20181219-release-8.4_GH0.tar.gz) = 66252712
>Index: cad/elmerfem/files/patch-CMakeLists.txt
>===================================================================
>--- cad/elmerfem/files/patch-CMakeLists.txt	(revision 508581)
>+++ cad/elmerfem/files/patch-CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
>+--- CMakeLists.txt.orig	2018-12-19 09:34:45 UTC
> +++ CMakeLists.txt
>-@@ -264,7 +264,7 @@ ADD_SUBDIRECTORY(umfpack)
>+@@ -377,7 +377,7 @@ ADD_SUBDIRECTORY(umfpack)
>  ADD_SUBDIRECTORY(fhutiter)
>  ADD_SUBDIRECTORY(meshgen2d)
>  ADD_SUBDIRECTORY(fem)
>Index: cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
>===================================================================
>--- cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt	(revision 508581)
>+++ cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- elmergrid/src/CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
>+--- elmergrid/src/CMakeLists.txt.orig	2018-12-19 09:34:45 UTC
> +++ elmergrid/src/CMakeLists.txt
>-@@ -31,7 +31,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC
>+@@ -33,7 +33,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRCS})
>  
>  TARGET_LINK_LIBRARIES(ElmerGrid metis m)
>  IF(NOT(WIN32))
>Index: cad/elmerfem/files/patch-fem_src_CMakeLists.txt
>===================================================================
>--- cad/elmerfem/files/patch-fem_src_CMakeLists.txt	(revision 508581)
>+++ cad/elmerfem/files/patch-fem_src_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- fem/src/CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
>+--- fem/src/CMakeLists.txt.orig	2018-12-19 09:34:45 UTC
> +++ fem/src/CMakeLists.txt
>-@@ -129,11 +129,11 @@ SET(ELMERSOLVER_LIBRARIES matc umfpack 
>+@@ -175,14 +175,14 @@ ENDIF()
>  
>  
>  ADD_EXECUTABLE(Solver_TGT Solver.F90)
>@@ -8,14 +8,17 @@
> +SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME "${ELMERSOLVER_OUTPUT_NAME}")
>  
>  IF(NOT(WIN32))
>--   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
>+   MESSAGE(STATUS " ELMERSOLVER_RPATH_STRING_MOD " ${ELMERSOLVER_RPATH_STRING_MOD})
>+   MESSAGE(STATUS " ELMERLIB_RPATH_STRING " ${ELMERLIB_RPATH_STRING})
>+ 
>+-   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING_MOD})
> -   SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH ${ELMERLIB_RPATH_STRING})
>-+   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
>++   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING_MOD}")
> +   SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH "${ELMERLIB_RPATH_STRING}")
>  ENDIF()
>  
>  IF(NOT(WITH_MPI))
>-@@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME
>+@@ -287,7 +287,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELMERSOLVER_LIBRAR
>  INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
>  
>  IF(NOT(WIN32))
>@@ -24,7 +27,7 @@
>  ENDIF()
>  
>  # GebhardFactors
>-@@ -247,7 +247,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
>+@@ -296,7 +296,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${ELMERSOLVER_LI
>                                        mpi_stubs elmersolver)
>  
>  IF(NOT(WIN32))
>@@ -33,17 +36,12 @@
>  ENDIF()
>  
>  IF(WITH_Trilinos)
>-@@ -291,9 +291,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE
>- 
>- IF(WITH_MPI)
>-   IF(NOT(WIN32))
>--    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)")
>+@@ -343,7 +343,7 @@ IF(WITH_MPI)
>+     # INSTALL(CODE "
>+     # EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver
>+     # WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)")
>+-    ADD_CUSTOM_TARGET(elmersolver_link ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver)
>++    # ADD_CUSTOM_TARGET(elmersolver_link ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver)
>+     ADD_DEPENDENCIES(elmersolver_link Solver_TGT)
>+     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ElmerSolver DESTINATION "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 508581)
>+++ cad/elmerfem/pkg-plist	(working copy)
>@@ -1,6 +1,5 @@
> bin/ElmerGrid
> bin/ElmerSolver
>-bin/ElmerSolver_mpi
> bin/GebhardtFactors
> bin/Mesh2D
> bin/ViewFactors
>@@ -14,6 +13,7 @@
> lib/elmersolver/libmatc.so
> lib/elmersolver/libmpi_stubs.so
> lib/elmersolver/libumfpack.a
>+libdata/ldconfig/elmerfem
> share/elmersolver/include/adaptive.mod
> share/elmersolver/include/ascbinoutpututils.mod
> share/elmersolver/include/bandmatrix.mod
>@@ -111,6 +111,7 @@
> share/elmersolver/lib/Acoustics.so
> share/elmersolver/lib/AdvectionDiffusion.so
> share/elmersolver/lib/AdvectionReaction.so
>+share/elmersolver/lib/AllocateSolver.so
> share/elmersolver/lib/ArteryOutlet.so
> share/elmersolver/lib/ArtificialCompressibility.so
> share/elmersolver/lib/CircuitsAndDynamics.so

Actions: View | Diff

Attachments on bug 219669: 183081 | 183139 | 183141 | 184214 | 206442