public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/, sci-misc/elmer-fem/files/
@ 2013-12-03 14:53 Justin Lecher
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2013-12-03 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     d7d5b682db50724172e027e581d6525b0e549324
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 14:52:25 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 14:52:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d7d5b682

sci-misc/elmer-fem: Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; fix whitespacing

Package-Manager: portage-2.2.7
RepoMan-Options: --force

---
 sci-misc/elmer-fem/ChangeLog                       | 12 ++++
 sci-misc/elmer-fem/elmer-fem-5.4.1-r1.ebuild       | 65 -------------------
 sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild      | 54 ++++++++++++++++
 sci-misc/elmer-fem/elmer-fem-9999.ebuild           | 65 ++++++++-----------
 .../elmer-fem/files/elmer-fem-6.0_p4651-oos.patch  | 75 ++++++++++++++++++++++
 .../files/elmer-fem-6.0_p4651-underlinking.patch   | 23 +++++++
 sci-misc/elmer-fem/metadata.xml                    |  5 ++
 7 files changed, 197 insertions(+), 102 deletions(-)

diff --git a/sci-misc/elmer-fem/ChangeLog b/sci-misc/elmer-fem/ChangeLog
new file mode 100644
index 0000000..de1bf37
--- /dev/null
+++ b/sci-misc/elmer-fem/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for sci-misc/elmer-fem
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*elmer-fem-6.0_p4651 (03 Dec 2013)
+
+  03 Dec 2013; Justin Lecher <jlec@gentoo.org> -elmer-fem-5.4.1-r1.ebuild,
+  +elmer-fem-6.0_p4651.ebuild, elmer-fem-9999.ebuild,
+  +files/elmer-fem-6.0_p4651-oos.patch,
+  +files/elmer-fem-6.0_p4651-underlinking.patch, +metadata.xml:
+  Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; fix whitespacing
+

diff --git a/sci-misc/elmer-fem/elmer-fem-5.4.1-r1.ebuild b/sci-misc/elmer-fem/elmer-fem-5.4.1-r1.ebuild
deleted file mode 100644
index ce60dcc..0000000
--- a/sci-misc/elmer-fem/elmer-fem-5.4.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit autotools eutils
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, main fem"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer"
-SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV}/${MY_PN}/?view=tar -> ${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mpi debug"
-DEPEND="sys-libs/glibc
-	virtual/blas
-	virtual/lapack
-	sci-libs/arpack
-	sci-libs/matc
-	sci-libs/elmer-hutiter
-	sci-libs/elmer-eio
-	mpi?     ( sys-cluster/mpich2 )"
-RDEPEND="${DEPEND}"
-# Note this seems to only configure correctly with the elmer version of umfpack
-# But this doesn't stop it from compiling / working without it
-
-S="${WORKDIR}/${PV}/fem"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# configure must be executable
-	chmod +x configure
-	epatch ${FILESDIR}/elmer-fem-Makefile-install.patch
-	eautoreconf
-}
-
-src_compile() {
-	cd "${S}"
-	local myconf
-	export FC="gfortran"
-	export F77="gfortran"
-	myconf="$myconf --with-blas --with-lapack --with-arpack --with-huti"
-	myconf="$myconf --with-eiof --with-matc"
-	#TODO parpack support is not picked up from the arpack package
-	#TODO --with-hypre --with-umfpack
-
-	use mpi && myconf="$myconf --with-mpi --with-mpi-dir=/usr"
-	use debug &&
-		myconf="${myconf} --with-debug" ||
-		myconf="${myconf} --without-debug"
-	econf $myconf || die "econf failed"
-	emake || die "emake failed"
-}
-
-
-src_install() {
-	emake ELMER_SOLVER_DATADIR="${D}/usr/share/elmersolver"  DESTDIR="${D}" install || die "emake install failed"
-}

diff --git a/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild b/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
new file mode 100644
index 0000000..d8289c2
--- /dev/null
+++ b/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+FORTRAN_STANDARD=90
+
+inherit autotools-utils fortran-2 multilib
+
+ELMER_ROOT="elmerfem"
+MY_PN=${PN/elmer-/}
+
+DESCRIPTION="Finite element programs, libraries, and visualization tools - main fem"
+HOMEPAGE="http://www.csc.fi/english/pages/elmer"
+SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mpi debug"
+
+RDEPEND="
+	virtual/blas
+	virtual/lapack
+	sci-libs/arpack
+	sci-libs/matc
+	sci-libs/elmer-hutiter
+	sci-libs/elmer-eio
+	mpi?     ( sys-cluster/mpich2 )"
+DEPEND="${RDEPEND}"
+# Note this seems to only configure correctly with the elmer version of umfpack
+# But this doesn't stop it from compiling / working without it
+
+S="${WORKDIR}/fem"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-oos.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with debug)
+		$(usex mpi --with-mpi "")
+		$(usex mpi --with-mpi-dir="${EPREFIX}"/usr "")
+		--with-arpack="$($(tc-getPKG_CONFIG) --libs arpack)"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--with-huti	--with-eiof --with-matc
+	)
+	autotools-utils_src_configure
+}

diff --git a/sci-misc/elmer-fem/elmer-fem-9999.ebuild b/sci-misc/elmer-fem/elmer-fem-9999.ebuild
index 9d97083..0c1260d 100644
--- a/sci-misc/elmer-fem/elmer-fem-9999.ebuild
+++ b/sci-misc/elmer-fem/elmer-fem-9999.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=5
 
-inherit autotools eutils subversion
+AUTOTOOLS_AUTORECONF=true
+FORTRAN_STANDARD=90
+
+inherit autotools-utils fortran-2 multilib subversion
 
 ELMER_ROOT="elmerfem"
 MY_PN=${PN/elmer-/}
 
-DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, main fem"
+DESCRIPTION="Finite element programs, libraries, and visualization tools - main fem"
 HOMEPAGE="http://www.csc.fi/english/pages/elmer"
-#SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV}/${MY_PN}/?view=tar -> ${P}.tar.gz"
 SRC_URI=""
-RESTRICT="mirror"
 ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}"
 ESVN_PROJECT="${MY_PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS=""
 IUSE="mpi debug"
-DEPEND="sys-libs/glibc
+
+RDEPEND="
 	virtual/blas
 	virtual/lapack
 	sci-libs/arpack
@@ -29,37 +31,26 @@ DEPEND="sys-libs/glibc
 	sci-libs/elmer-hutiter
 	sci-libs/elmer-eio
 	mpi?     ( sys-cluster/mpich2 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+# Note this seems to only configure correctly with the elmer version of umfpack
+# But this doesn't stop it from compiling / working without it
 
-S="${WORKDIR}/${PV}/fem"
+S="${WORKDIR}/fem"
 
-src_prepare() {
-	#unpack ${A}
-	cd "${S}"
-	# configure must be executable
-	#chmod +x configure
-	epatch ${FILESDIR}/elmer-fem-Makefile-install.patch
-	eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0_p4651-oos.patch
+	"${FILESDIR}"/${PN}-6.0_p4651-underlinking.patch
+)
 
 src_configure() {
-	cd "${S}"
-	local myconf
-	export FC="gfortran"
-	export F77="gfortran"
-	myconf="$myconf --with-blas --with-lapack --with-arpack --with-huti"
-	myconf="$myconf --with-eiof --with-matc"
-	#TODO parpack support is not picked up from the arpack package
-	#TODO --with-hypre --with-umfpack
-
-	use mpi && myconf="$myconf --with-mpi --with-mpi-dir=/usr"
-	use debug &&
-		myconf="${myconf} --with-debug" ||
-		myconf="${myconf} --without-debug"
-	econf $myconf || die "econf failed"
-}
-
-
-src_install() {
-	emake ELMER_SOLVER_DATADIR="/usr/share/elmersolver" DESTDIR=${D} install || die "emake install failed"
+	local myeconfargs=(
+		$(use_with debug)
+		$(usex mpi --with-mpi "")
+		$(usex mpi --with-mpi-dir="${EPREFIX}"/usr "")
+		--with-arpack="$($(tc-getPKG_CONFIG) --libs arpack)"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--with-huti	--with-eiof --with-matc
+	)
+	autotools-utils_src_configure
 }

diff --git a/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-oos.patch b/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-oos.patch
new file mode 100644
index 0000000..00291bc
--- /dev/null
+++ b/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-oos.patch
@@ -0,0 +1,75 @@
+ src/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9e48c31..b94705c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -182,11 +182,11 @@ SC2Elmer_SOURCES = SC2Elmer.c
+ 
+ if USE_LOCAL_MPIF_H
+ mpif: mpif_stub.h
+-	$(CP) mpif_stub.h mpif.h
+-	$(CP) mpif_stub.h mpif
++	$(CP) $(srcdir)/mpif_stub.h mpif.h
++	$(CP) $(srcdir)/mpif_stub.h mpif
+ else 
+ mpif: mpif_stub.h
+-	$(CP) mpif_stub.h mpif
++	$(CP) $(srcdir)/mpif_stub.h mpif
+ endif
+ 
+ EXTRA_DIST = \
+ src/Makefile.am | 25 +++++++++++++------------
+ 1 file changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 92de7a4..89a2236 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -144,32 +144,33 @@ ELMER_SOLVER_DATADIR=$(prefix)/share/elmersolver
+ install-data-local:
+ 	@echo "Installing solvers to ${ELMER_SOLVER_DATADIR}/lib"
+ 
+-	mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib
+-	$(CP) `ls -f *$(SHL_EXT) | grep -v libelmersolver` $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib
+-	$(CP) elements.def $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib
+-	$(CP) SOLVER.KEYWORDS $(DESTDIR)$(ELMER_SOLVER_DATADIR)/lib
++	mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir)
++	$(CP) `ls -f $(builddir)/*$(SHL_EXT) | grep -v libelmersolver` $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir)
++	$(CP) $(srcdir)/elements.def $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir)
++	$(CP) $(srcdir)/SOLVER.KEYWORDS $(DESTDIR)$(ELMER_SOLVER_DATADIR)/$(libdir)
+ 
+ 	@echo "Installing *.mod to ${ELMER_SOLVER_DATADIR}/include"
+ 	mkdir -p $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include
+-	$(CP) *.mod $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include
++	$(CP) $(builddir)/*.mod $(DESTDIR)$(ELMER_SOLVER_DATADIR)/include
+ 
+ 
+ install-exec-local:
+ 	@echo "Installing stuff to ${prefix}/bin"
+ 	$(MKDIR) $(DESTDIR)$(prefix)/bin
+-	$(CP) ElmerSolver$(EXEEXT) $(DESTDIR)$(prefix)/bin
+-	$(CP) ViewFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin
+-	$(CP) GebhardtFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin
++	$(CP) $(builddir)/ElmerSolver$(EXEEXT) $(DESTDIR)$(prefix)/bin
++	$(CP) $(builddir)/ViewFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin
++	$(CP) $(builddir)/GebhardtFactors$(EXEEXT) $(DESTDIR)$(prefix)/bin
+ if USE_WINDOWS_COMPILER
+ 	$(CP) libelmersolver*$(SHL_EXT) $(DESTDIR)$(prefix)/lib
+ else
+-	$(CP) libelmersolver-$(VERSION)$(SHL_EXT) $(DESTDIR)$(prefix)/lib
++	mkdir -p $(DESTDIR)$(prefix)/$(libdir)
++	$(CP) $(builddir)/libelmersolver-$(VERSION)$(SHL_EXT) $(DESTDIR)$(prefix)/$(libdir)
+ 	$(LN) -sf libelmersolver-$(VERSION)$(SHL_EXT)\
+-              $(DESTDIR)$(prefix)/lib/libelmersolver$(SHL_EXT)
++              $(DESTDIR)$(prefix)/$(libdir)/libelmersolver$(SHL_EXT)
+ endif
+-	$(CP) elmerf90 elmerf90-nosh elmerld $(DESTDIR)$(prefix)/bin
++	$(CP) $(builddir)/elmerf90 $(builddir)/elmerf90-nosh elmerld $(DESTDIR)$(prefix)/bin
+ if USE_MPI
+-	$(CP) ElmerSolver_mpi$(EXEEXT) $(DESTDIR)$(prefix)/bin
++	$(CP) $(builddir)/ElmerSolver_mpi$(EXEEXT) $(DESTDIR)$(prefix)/bin
+ endif
+ 
+ clean-local:

diff --git a/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-underlinking.patch b/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-underlinking.patch
new file mode 100644
index 0000000..7c6be1d
--- /dev/null
+++ b/sci-misc/elmer-fem/files/elmer-fem-6.0_p4651-underlinking.patch
@@ -0,0 +1,23 @@
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b94705c..92de7a4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -122,13 +122,13 @@ if USE_WINDOWS_COMPILER
+ else
+ 	$(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \
+ 	      -o ViewFactors$(EXE_EXT) ViewFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) \
+-	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS) $(STDCXX_LIBS)
++	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) $(BLAS_LIBS) $(STDCXX_LIBS) -lhuti
+ endif
+ 
+ GebhardtFactors$(EXE_EXT): libelmersolver$(SHL_EXT) GebhardtFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT)
+ 	$(FC) $(SH_LINKING_TO_FLAGS) $(RPATH_ELMER) $(B64FLAGS) $(LDFLAGS) \
+ 	      -o GebhardtFactors$(EXE_EXT) GebhardtFactors$(OBJ_EXT) mpi_stubs$(OBJ_EXT) \
+-	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS)
++	      -L. -lelmersolver viewaxis/libviewaxis.a view3d/libview3d.a $(EXTRA_LIBS) -lhuti
+ 
+ 
+ 

diff --git a/sci-misc/elmer-fem/metadata.xml b/sci-misc/elmer-fem/metadata.xml
new file mode 100644
index 0000000..897aa2e
--- /dev/null
+++ b/sci-misc/elmer-fem/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/, sci-misc/elmer-fem/files/
@ 2021-11-04 10:25 Andrew Ammerlaan
  0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2021-11-04 10:25 UTC (permalink / raw
  To: gentoo-commits

commit:     213da7e78c0a86d5aab7eb0ac26a60bc5df94d20
Author:     David E <dave.eckold <AT> gmail <DOT> com>
AuthorDate: Wed Nov  3 18:13:33 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 10:25:29 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=213da7e7

sci-misc/elmer-fem: Fix compile error

Hi

This pull request fixes a compile error associated with issue
[#274](https://github.com/ElmerCSC/elmerfem/issues/274).

I've added the patch attached to this issue as well as the following:

 - Bumped ebuild EAPI to version 8
 - Exposed a useflag for WITH_Mumps
 - removed the softblock on arpack by changing the
    ELMER_INSTALL_LIB_DIR to `/usr/$(get_libdir)/elmersolver`
    This location matches the cmake file from upstream and prevents
    a collision with system arpack.

Signed-off-by: David Eckold <dave.eckold <AT> gmail.com>
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Closes: https://github.com/gentoo/sci/pull/1120
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild         | 76 ++++++++++++++++++++++
 .../elmer-fem-DCRComplexSolve-compile-error.patch  | 70 ++++++++++++++++++++
 sci-misc/elmer-fem/metadata.xml                    |  1 +
 3 files changed, 147 insertions(+)

diff --git a/sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild b/sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild
new file mode 100644
index 000000000..c1ec06737
--- /dev/null
+++ b/sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_STANDARD=90
+
+inherit fortran-2 flag-o-matic cmake multilib
+
+ELMER_ROOT="elmerfem"
+MY_PN=${PN/elmer-/}
+
+DESCRIPTION="Finite element programs, libraries, and visualization tools"
+HOMEPAGE="https://www.csc.fi/web/elmer http://www.elmerfem.org/blog/"
+SRC_URI="https://github.com/ElmerCSC/elmerfem/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ice gui matc mumps mpi post test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/blas
+	virtual/lapack
+	sci-libs/arpack
+	mumps? ( sci-libs/mumps )
+	mpi? ( sys-cluster/openmpi )
+	post? (
+		dev-lang/tcl:0=
+		dev-lang/tk:0=
+	)
+	gui? ( x11-libs/qwt:6 )
+"
+DEPEND="${RDEPEND}"
+# Note this seems to only configure correctly with the elmer version of umfpack
+# But this doesn't stop it from compiling / working without it
+
+PATCHES=(
+	"${FILESDIR}/${PN}-DCRComplexSolve-compile-error.patch"
+	"${FILESDIR}/${PN}-ElmerIce-compile.patch"
+)
+
+S="${WORKDIR}/elmerfem-release-${PV}"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/#include <QPainter>/a #include <QPainterPath>' ElmerGUI/Application/twod/renderarea.cpp || die
+	test-flag-FC -fallow-argument-mismatch && append-fflags -fallow-argument-mismatch
+	test-flag-FC -fallow-invalid-boz && append-fflags -fallow-invalid-boz
+	# TODO: fix the tests, fails in compile phase: multiple rules to make target
+	rm -r fem/tests/* || die
+	touch fem/tests/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMPI_Fortran_COMPILE_FLAGS="$FCFLAGS"
+		-DCMAKE_Fortran_FLAGS="$FCFLAGS"
+		-DELMER_INSTALL_LIB_DIR="/usr/$(get_libdir)/elmersolver"
+		-DWITH_MPI="$(usex mpi)"
+		-DWITH_OpenMP="$(usex mpi)"
+		-DWITH_MATC="$(usex matc)"
+		-DWITH_Mumps="$(usex mumps)"
+		-DWITH_ElmerIce="$(usex ice)"
+		-DWITH_ELMERPOST="$(usex post)"
+		-DWITH_ELMERGUI="$(usex gui)"
+		-DWITH_QT5="$(usex gui)"
+		-DWITH_QWT="$(usex gui)"
+		-DQWT_INCLUDE_DIR="/usr/include/qwt6"
+		-DQWT_LIBRARY="/usr/$(get_libdir)/libqwt6-qt5.so"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}

diff --git a/sci-misc/elmer-fem/files/elmer-fem-DCRComplexSolve-compile-error.patch b/sci-misc/elmer-fem/files/elmer-fem-DCRComplexSolve-compile-error.patch
new file mode 100644
index 000000000..6f9cdf289
--- /dev/null
+++ b/sci-misc/elmer-fem/files/elmer-fem-DCRComplexSolve-compile-error.patch
@@ -0,0 +1,70 @@
+From 8ea87194fb50ff052a75212f9d2a2ae217edad95 Mon Sep 17 00:00:00 2001
+From: Mathias <mathias@localhost.localdomain>
+Date: Sun, 2 May 2021 12:06:15 +0200
+Subject: [PATCH] fixed DCRComplexSolve compile error
+
+---
+ fem/src/modules/DCRComplexSolve.F90 | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/fem/src/modules/DCRComplexSolve.F90 b/fem/src/modules/DCRComplexSolve.F90
+index cfa71dee..b6bb59bc 100644
+--- a/fem/src/modules/DCRComplexSolve.F90
++++ b/fem/src/modules/DCRComplexSolve.F90
+@@ -426,7 +426,7 @@ CONTAINS
+    SUBROUTINE InputTensor( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+       REAL(KIND=dp) :: Tensor(:,:,:)
+-      INTEGER :: n, NodeIndexes(:)
++      INTEGER :: n, i, j, NodeIndexes(:)
+       LOGICAL :: IsScalar
+       CHARACTER(LEN=*) :: Name
+       TYPE(ValueList_t), POINTER :: Material
+@@ -485,7 +485,7 @@ CONTAINS
+    SUBROUTINE InputVector( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+       REAL(KIND=dp) :: Tensor(:,:)
+-      INTEGER :: n, NodeIndexes(:)
++      INTEGER :: n, i, NodeIndexes(:)
+       LOGICAL :: IsScalar
+       CHARACTER(LEN=*) :: Name
+       TYPE(ValueList_t), POINTER :: Material
+@@ -543,7 +543,7 @@ CONTAINS
+     REAL(KIND=dp) :: DiffCoef(3,3), Velo(3)
+     COMPLEX(KIND=dp) :: LSTIFF(2*n,2*n), LFORCE(2*n), A
+     LOGICAL :: Stat
+-    INTEGER :: i,p,q,t,dim, NBasis, CoordSys
++    INTEGER :: i,j,p,q,t,dim, NBasis, CoordSys
+     TYPE(GaussIntegrationPoints_t) :: IntegStuff
+ 
+     REAL(KIND=dp) :: X,Y,Z,Metric(3,3),SqrtMetric,Symb(3,3,3),dSymb(3,3,3,3)
+@@ -678,7 +678,7 @@ CONTAINS
+          C1(3), C0
+     COMPLEX(KIND=dp) :: LSTIFF(n,n), LFORCE(n), A
+     LOGICAL :: Stat
+-    INTEGER :: i,p,q,t,dim,CoordSys
++    INTEGER :: i,j,p,q,t,dim,CoordSys
+     TYPE(GaussIntegrationPoints_t) :: IntegStuff
+ !------------------------------------------------------------------------------
+     dim = CoordinateSystemDimension()
+@@ -1374,7 +1374,7 @@ contains
+    SUBROUTINE InputTensor( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+       REAL(KIND=dp) :: Tensor(:,:,:)
+-      INTEGER :: n, NodeIndexes(:)
++      INTEGER :: n, i, NodeIndexes(:)
+       LOGICAL :: IsScalar
+       CHARACTER(LEN=*) :: Name
+       TYPE(ValueList_t), POINTER :: Material
+@@ -1426,7 +1426,7 @@ contains
+    SUBROUTINE InputVector( Tensor, IsScalar, Name, Material, n, NodeIndexes )
+ !------------------------------------------------------------------------------
+       REAL(KIND=dp) :: Tensor(:,:)
+-      INTEGER :: n, NodeIndexes(:)
++      INTEGER :: n, i, NodeIndexes(:)
+       LOGICAL :: IsScalar
+       CHARACTER(LEN=*) :: Name
+       TYPE(ValueList_t), POINTER :: Material
+-- 
+2.31.1
+

diff --git a/sci-misc/elmer-fem/metadata.xml b/sci-misc/elmer-fem/metadata.xml
index 341020564..feab34b47 100644
--- a/sci-misc/elmer-fem/metadata.xml
+++ b/sci-misc/elmer-fem/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name="gui">Build the ElmerGUI</flag>
 		<flag name="matc">Build the Elmer matc library</flag>
 		<flag name="ice">Build ElmerICE</flag>
+		<flag name="mumps">Build with Mumps</flag>
 		<flag name="post">Build ElmerPOST</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/, sci-misc/elmer-fem/files/
@ 2022-08-31 10:22 Andrew Ammerlaan
  0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2022-08-31 10:22 UTC (permalink / raw
  To: gentoo-commits

commit:     934c792bfe35860a3675d7f179f14ed7c135eede
Author:     System user; root <root <AT> localhost <DOT> localdomain>
AuthorDate: Thu Aug 25 02:59:44 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 10:18:25 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=934c792b

sci-misc: elmer-fem fix rpath and make compatible with qwt-6.2

Co-authored-by: Terry Wrist
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Closes: https://github.com/gentoo/sci/pull/1167

 ...r-fem-9.0-r1.ebuild => elmer-fem-9.0-r2.ebuild} |  2 ++
 .../elmer-fem/files/elmer-fem-9.0-qwt-6.2.patch    | 35 ++++++++++++++++++++++
 sci-misc/elmer-fem/files/elmer-fem-rpath.patch     | 11 +++++++
 3 files changed, 48 insertions(+)

diff --git a/sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild b/sci-misc/elmer-fem/elmer-fem-9.0-r2.ebuild
similarity index 96%
rename from sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild
rename to sci-misc/elmer-fem/elmer-fem-9.0-r2.ebuild
index 6d810ed14..82e1c796f 100644
--- a/sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild
+++ b/sci-misc/elmer-fem/elmer-fem-9.0-r2.ebuild
@@ -40,6 +40,8 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${PN}-DCRComplexSolve-compile-error.patch"
 	"${FILESDIR}/${PN}-ElmerIce-compile.patch"
+	"${FILESDIR}/${PN}-rpath.patch"
+	"${FILESDIR}/${P}-qwt-6.2.patch"
 )
 
 S="${WORKDIR}/elmerfem-release-${PV}"

diff --git a/sci-misc/elmer-fem/files/elmer-fem-9.0-qwt-6.2.patch b/sci-misc/elmer-fem/files/elmer-fem-9.0-qwt-6.2.patch
new file mode 100644
index 000000000..13eaf1c5f
--- /dev/null
+++ b/sci-misc/elmer-fem/files/elmer-fem-9.0-qwt-6.2.patch
@@ -0,0 +1,35 @@
+From 48e9430ccb858ca5bda28b967a0c84b51e2404b2 Mon Sep 17 00:00:00 2001
+From: "E. Albiter" <ealbiter@gmail.com>
+Date: Fri, 15 Oct 2021 13:12:48 -0500
+Subject: [PATCH] Compatibility with Qwt 6.2. Fix for #293
+
+---
+ ElmerGUI/Application/src/convergenceview.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ElmerGUI/Application/src/convergenceview.h b/ElmerGUI/Application/src/convergenceview.h
+index 377b644b99..4259eb730e 100755
+--- a/ElmerGUI/Application/src/convergenceview.h
++++ b/ElmerGUI/Application/src/convergenceview.h
+@@ -51,8 +51,8 @@
+ #include <qwt_plot_curve.h>
+ #include <qwt_plot_grid.h>
+ #include <qwt_legend.h>
+-/*#include <qwt_data.h> <-- deprecated in Qwt6, using qwt_compat.h instead*/
+-#include <qwt_compat.h>
++/*#include <qwt_data.h> <-- deprecated in Qwt6, using qwt_compat.h instead
++#include <qwt_compat.h> <-- Removed in Qwt 6.2 */
+ #include <qwt_text.h>
+ #include <qwt_scale_engine.h>
+ 
+@@ -76,8 +76,8 @@ class CurveData
+   
+ private:
+   int d_count;
+-  QwtArray<double> d_x;
+-  QwtArray<double> d_y;
++  QVector<double> d_x;
++  QVector<double> d_y;
+ };
+ 
+ class Curve

diff --git a/sci-misc/elmer-fem/files/elmer-fem-rpath.patch b/sci-misc/elmer-fem/files/elmer-fem-rpath.patch
new file mode 100644
index 000000000..27249fef9
--- /dev/null
+++ b/sci-misc/elmer-fem/files/elmer-fem-rpath.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt.orig	2022-08-24 21:50:59.940905698 -0500
++++ b/CMakeLists.txt	2022-08-24 21:51:08.610804464 -0500
+@@ -479,7 +479,7 @@
+ 
+ # Set up rpaths to point ELMER_INSTALL_LIB_DIR
+ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")   
+-  SET(ELMERSOLVER_RPATH_STRING "\$ORIGIN/../${ELMER_INSTALL_LIB_DIR}")
++  SET(ELMERSOLVER_RPATH_STRING "${ELMER_INSTALL_LIB_DIR}")
+   SET(ELMERLIB_RPATH_STRING "\$ORIGIN/")
+ ELSEIF(APPLE)                               
+   SET(ELMERSOLVER_RPATH_STRING "@loader_path/../${ELMER_INSTALL_LIB_DIR}")


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-31 10:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-31 10:22 [gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/, sci-misc/elmer-fem/files/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2021-11-04 10:25 Andrew Ammerlaan
2013-12-03 14:53 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox