Date: Mon, 2 Apr 2018 20:02:20 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466257 - head/cad/elmerfem Message-ID: <201804022002.w32K2Kkf065564@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Mon Apr 2 20:02:19 2018 New Revision: 466257 URL: https://svnweb.freebsd.org/changeset/ports/466257 Log: Fix build of cad/elmerfem ahead of CMake 3.11. - Bump to the actual 8.3 release, instead of a few days and revisions short of it. There's no uploaded tarball, so we're still stuck with GH tags. - Build out-of-source; with CMake 3.11 you can no longer add a library with no (zero) sources, and the existing setup was picking up build- cache directories like CMakeFiles/ to turn into Elmer libraries. - As a side-effect, this shows the bogus library added to the plist some time earlier -- CMakeFiles is not an actual Elmer plugin. - Detection of <inttypes.h> is broken because of the way Fortran libraries are added to the link line, but gcc_s isn't; this leads to header detection that fails in linking. So just tell CMake that inttypes.h exists, instead. Approved by: tcberner (mentor, implicit) Modified: head/cad/elmerfem/Makefile head/cad/elmerfem/distinfo head/cad/elmerfem/pkg-plist Modified: head/cad/elmerfem/Makefile ============================================================================== --- head/cad/elmerfem/Makefile Mon Apr 2 19:48:24 2018 (r466256) +++ head/cad/elmerfem/Makefile Mon Apr 2 20:02:19 2018 (r466257) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= elmerfem -PORTVERSION= 8.3.20170519 -PORTREVISION= 2 +PORTVERSION= 8.3.20170524 CATEGORIES= cad science MAINTAINER= ports@FreeBSD.org @@ -16,13 +15,14 @@ LIB_DEPENDS= libparpack.so:math/arpack-ng-mpich \ USE_GITHUB= yes GH_ACCOUNT= ElmerCSC -GH_TAGNAME= c30fff2 +GH_TAGNAME= release-8.3 -USES= blaslapack:netlib cmake fortran gmake tcl +USES= blaslapack:netlib cmake:outsource fortran gmake tcl USE_LDCONFIG= ${PREFIX}/lib/elmersolver ALL_TARGET= # empty +CMAKE_ARGS+= -DHAVE_INTTYPES_H=ON .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev .endif Modified: head/cad/elmerfem/distinfo ============================================================================== --- head/cad/elmerfem/distinfo Mon Apr 2 19:48:24 2018 (r466256) +++ head/cad/elmerfem/distinfo Mon Apr 2 20:02:19 2018 (r466257) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495312420 -SHA256 (ElmerCSC-elmerfem-8.3.20170519-c30fff2_GH0.tar.gz) = 7b9e9b4abaf4801dec383f7b7d8f339c274aaa0c98d8320564ed4616a1115e68 -SIZE (ElmerCSC-elmerfem-8.3.20170519-c30fff2_GH0.tar.gz) = 57920491 +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 Modified: head/cad/elmerfem/pkg-plist ============================================================================== --- head/cad/elmerfem/pkg-plist Mon Apr 2 19:48:24 2018 (r466256) +++ head/cad/elmerfem/pkg-plist Mon Apr 2 20:02:19 2018 (r466257) @@ -113,7 +113,6 @@ share/elmersolver/lib/AdvectionDiffusion.so share/elmersolver/lib/AdvectionReaction.so share/elmersolver/lib/ArteryOutlet.so share/elmersolver/lib/ArtificialCompressibility.so -share/elmersolver/lib/CMakeFiles.so share/elmersolver/lib/CircuitsAndDynamics.so share/elmersolver/lib/CoilSolver.so share/elmersolver/lib/CompressibleNS.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804022002.w32K2Kkf065564>