* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/
@ 2019-08-05 13:30 Matthias Maier
0 siblings, 0 replies; 6+ messages in thread
From: Matthias Maier @ 2019-08-05 13:30 UTC (permalink / raw
To: gentoo-commits
commit: 73a1cbc09af77b0f795d04b4e3a3bf3629b3177f
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 5 12:06:17 2019 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Aug 5 13:23:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a1cbc0
sci-libs/dealii: ebuild maintenance
* remove local description in metadata
* avoid warning about unused variable
* do not export LDFLAGS in pc files
Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/dealii/dealii-9.1.1.ebuild | 26 +++++++++++++++++-----
sci-libs/dealii/dealii-9999.ebuild | 26 +++++++++++++++++-----
.../dealii/files/dealii-9.1.1-no-ld-flags.patch | 20 +++++++++++++++++
3 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/sci-libs/dealii/dealii-9.1.1.ebuild b/sci-libs/dealii/dealii-9.1.1.ebuild
index 0da4f8ea6ed..719f7819739 100644
--- a/sci-libs/dealii/dealii-9.1.1.ebuild
+++ b/sci-libs/dealii/dealii-9.1.1.ebuild
@@ -33,10 +33,10 @@ fi
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="
- adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_sse2 cuda +debug
- doc +examples gmsh +gsl hdf5 +lapack metis mpi muparser nanoflann
- opencascade netcdf p4est petsc scalapack slepc +sparse static-libs
- sundials symengine +tbb trilinos
+ adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
+ cpu_flags_x86_sse2 cuda +debug doc +examples gmsh +gsl hdf5 +lapack
+ metis mpi muparser nanoflann opencascade netcdf p4est petsc scalapack
+ slepc +sparse static-libs sundials symengine +tbb trilinos
"
# TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -76,6 +76,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen[dot] dev-lang/perl )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+)
+
src_configure() {
# deal.II needs a custom build type:
local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
@@ -97,9 +101,7 @@ src_configure() {
-DDEAL_II_WITH_ADOLC="$(usex adolc)"
-DDEAL_II_WITH_ASSIMP="$(usex assimp)"
-DDEAL_II_WITH_ARPACK="$(usex arpack)"
- -DDEAL_II_HAVE_AVX="$(usex cpu_flags_x86_avx)"
-DDEAL_II_WITH_CUDA="$(usex cuda)"
- -DDEAL_II_HAVE_SSE2="$(usex cpu_flags_x86_sse2)"
-DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
-DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
-DDEAL_II_WITH_GMSH="$(usex gmsh)"
@@ -125,6 +127,18 @@ src_configure() {
-DDEAL_II_WITH_THREADS="$(usex tbb)"
-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
)
+
+ # Do a little dance for purely cosmetic "QA" reasons. The build system
+ # does query for the highest instruction set first and skips the other
+ # variables if a "higher" variant is set
+ if use cpu_flags_x86_avx512f; then
+ mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
+ elif use cpu_flags_x86_avx; then
+ mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
+ elif use cpu_flags_x86_avx; then
+ mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
+ fi
+
cmake-utils_src_configure
}
diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild
index 0da4f8ea6ed..719f7819739 100644
--- a/sci-libs/dealii/dealii-9999.ebuild
+++ b/sci-libs/dealii/dealii-9999.ebuild
@@ -33,10 +33,10 @@ fi
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="
- adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_sse2 cuda +debug
- doc +examples gmsh +gsl hdf5 +lapack metis mpi muparser nanoflann
- opencascade netcdf p4est petsc scalapack slepc +sparse static-libs
- sundials symengine +tbb trilinos
+ adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
+ cpu_flags_x86_sse2 cuda +debug doc +examples gmsh +gsl hdf5 +lapack
+ metis mpi muparser nanoflann opencascade netcdf p4est petsc scalapack
+ slepc +sparse static-libs sundials symengine +tbb trilinos
"
# TODO: add slepc use flag once slepc is packaged for gentoo-science
@@ -76,6 +76,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen[dot] dev-lang/perl )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+)
+
src_configure() {
# deal.II needs a custom build type:
local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
@@ -97,9 +101,7 @@ src_configure() {
-DDEAL_II_WITH_ADOLC="$(usex adolc)"
-DDEAL_II_WITH_ASSIMP="$(usex assimp)"
-DDEAL_II_WITH_ARPACK="$(usex arpack)"
- -DDEAL_II_HAVE_AVX="$(usex cpu_flags_x86_avx)"
-DDEAL_II_WITH_CUDA="$(usex cuda)"
- -DDEAL_II_HAVE_SSE2="$(usex cpu_flags_x86_sse2)"
-DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
-DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
-DDEAL_II_WITH_GMSH="$(usex gmsh)"
@@ -125,6 +127,18 @@ src_configure() {
-DDEAL_II_WITH_THREADS="$(usex tbb)"
-DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
)
+
+ # Do a little dance for purely cosmetic "QA" reasons. The build system
+ # does query for the highest instruction set first and skips the other
+ # variables if a "higher" variant is set
+ if use cpu_flags_x86_avx512f; then
+ mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
+ elif use cpu_flags_x86_avx; then
+ mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
+ elif use cpu_flags_x86_avx; then
+ mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
+ fi
+
cmake-utils_src_configure
}
diff --git a/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch b/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch
new file mode 100644
index 00000000000..69c2c09e679
--- /dev/null
+++ b/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch
@@ -0,0 +1,20 @@
+diff --git a/cmake/config/config_debug.pc.in b/cmake/config/config_debug.pc.in
+index 5ea03885cd..32e45d8121 100644
+--- a/cmake/config/config_debug.pc.in
++++ b/cmake/config/config_debug.pc.in
+@@ -8,4 +8,4 @@ Version: @DEAL_II_VERSION@
+ URL: https://dealii.org/
+
+ Cflags: @DEAL_II_CXX_FLAGS@ @DEAL_II_CXX_FLAGS_DEBUG@ @CONFIG_INCLUDE_DIRS_PC@
+-Libs: @DEAL_II_LINKER_FLAGS@ @DEAL_II_LINKER_FLAGS_DEBUG@ @CONFIG_LIBRARIES_DEBUG_PC@ @CONFIG_RPATH_DEBUG_PC@
++Libs: @CONFIG_LIBRARIES_DEBUG_PC@ @CONFIG_RPATH_DEBUG_PC@
+diff --git a/cmake/config/config_release.pc.in b/cmake/config/config_release.pc.in
+index 726a35d040..8a879d07e8 100644
+--- a/cmake/config/config_release.pc.in
++++ b/cmake/config/config_release.pc.in
+@@ -8,4 +8,4 @@ Version: @DEAL_II_VERSION@
+ URL: https://dealii.org/
+
+ Cflags: @DEAL_II_CXX_FLAGS@ @DEAL_II_CXX_FLAGS_RELEASE@ @CONFIG_INCLUDE_DIRS_PC@
+-Libs: @DEAL_II_LINKER_FLAGS@ @DEAL_II_LINKER_FLAGS_RELEASE@ @CONFIG_LIBRARIES_RELEASE_PC@ @CONFIG_RPATH_RELEASE_PC@
++Libs: @CONFIG_LIBRARIES_RELEASE_PC@ @CONFIG_RPATH_RELEASE_PC@
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/
@ 2021-04-27 19:47 Matthias Maier
0 siblings, 0 replies; 6+ messages in thread
From: Matthias Maier @ 2021-04-27 19:47 UTC (permalink / raw
To: gentoo-commits
commit: f1655cd03ce6ddb7b5f018ee2c55b9539360108f
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 19:47:03 2021 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 19:47:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1655cd0
sci-libs/dealii: fix compilation with modern boost
Upstream: https://github.com/dealii/dealii/commit/9c1a580
Closes: https://bugs.gentoo.org/764962
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/dealii/dealii-9.2.0.ebuild | 1 +
.../dealii-9.2.0-fix-boost-include-file.patch | 25 ++++++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/sci-libs/dealii/dealii-9.2.0.ebuild b/sci-libs/dealii/dealii-9.2.0.ebuild
index 0974d9bee5a..00d5f0fe242 100644
--- a/sci-libs/dealii/dealii-9.2.0.ebuild
+++ b/sci-libs/dealii/dealii-9.2.0.ebuild
@@ -73,6 +73,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+ "${FILESDIR}"/${PN}-9.2.0-fix-boost-include-file.patch
)
src_configure() {
diff --git a/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch b/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
new file mode 100644
index 00000000000..9fc6365d01c
--- /dev/null
+++ b/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
@@ -0,0 +1,25 @@
+From 9c1a580139f557433a226da437382b3f4307f7c8 Mon Sep 17 00:00:00 2001
+From: Luca Heltai <luca.heltai@sissa.it>
+Date: Wed, 30 Dec 2020 09:54:02 +0100
+Subject: [PATCH] Fix boost include file.
+
+---
+ source/fe/mapping.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/source/fe/mapping.cc b/source/fe/mapping.cc
+index 288a9debcb..4ef3ef7714 100644
+--- a/source/fe/mapping.cc
++++ b/source/fe/mapping.cc
+@@ -20,6 +20,8 @@
+
+ #include <deal.II/grid/tria.h>
+
++#include <boost/geometry.hpp>
++
+ DEAL_II_NAMESPACE_OPEN
+
+
+--
+2.26.3
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/
@ 2021-09-07 16:19 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-09-07 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 75caa1d7f7c57dfbe32bc1220ec79bbf7cc1b02e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 7 10:18:10 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 16:19:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75caa1d7
sci-libs/dealii: Drop 9.2.0-r1, cmake-utils--
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/dealii/Manifest | 2 -
sci-libs/dealii/dealii-9.2.0-r1.ebuild | 160 ---------------------
.../dealii-9.2.0-fix-boost-include-file.patch | 25 ----
sci-libs/dealii/metadata.xml | 2 -
4 files changed, 189 deletions(-)
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 9dc09aab7ee..1ba2ba2ea65 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,5 +1,3 @@
-DIST dealii-9.2.0-offline_documentation.tar.gz 277987911 BLAKE2B d14e15bc252f481707b04e9ca3fd05b5469035537a099466a8272fa1d56833c99d845871534df75bbb2efb29063e738700a5a2815b653cdd14b49b3a93add368 SHA512 9680731b4d837561c3682a65391b442cfb8d2a947b0e4e37cad1df83877b371997d084eac52e2bf34b190ea54996d41ddd89bee79fff24d710199417f3f345ab
-DIST dealii-9.2.0.tar.gz 24688964 BLAKE2B 60a8ede72a49cb2e658b3d6d53fb332a96f44a7fb9bb499ba54175138d49f38a9b75d9bea2eaddcaa3f50d97ce53961692b35f89578f535d32301680e6f1d68b SHA512 7c76435e45c9c302c4f95f588229f5a9b81f0450bd029729553c706a25dfd16f5c02c50fd2618d7e285d18927b63426110d2c6a074242b91cf789bd4bc77acc5
DIST dealii-9.3.0-offline_documentation.tar.gz 342390250 BLAKE2B 5ed1e5d5f7cd6a44f0dccc4b092c241fadc430facb77ec2a9ffb30d00dc13751f0ac08e2f05960584fbb60b26b64fa070c437f392e2e62b4ba1328e4efcd0677 SHA512 ff04cf3690160119041a9dc102ece81c351c41809fe1717cbc95aa97f2f1fe2ccc36e1b4b3045b73056a54fc7e3a27d3d734908760e9c34203b566b328b104b7
DIST dealii-9.3.0.tar.gz 24458373 BLAKE2B 27cdaee4e7ec9c170e11c5ba9bff8fd654bb2a9452df3402d5639268a6fe31565faa38d240810a0323b7253f2ed665c25fa0948c56b9924f1836531f2414bc92 SHA512 d558b5dda1067f7d995bc5f265614e3bc5e70190d24c1c61047af1ddc52fa007013c51901b9b8eacfbe8b360dffcb22aca87e0019ee09581b928e00c39198c98
DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18
diff --git a/sci-libs/dealii/dealii-9.2.0-r1.ebuild b/sci-libs/dealii/dealii-9.2.0-r1.ebuild
deleted file mode 100644
index fa6f92f0b59..00000000000
--- a/sci-libs/dealii/dealii-9.2.0-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils multilib
-
-# deal.II uses its own FindLAPACK.cmake file that calls into the system
-# FindLAPACK.cmake module and does additional internal setup. Do not remove
-# any of these modules:
-CMAKE_REMOVE_MODULES_LIST=""
-
-DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="https://www.dealii.org/"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dealii/dealii.git"
- SRC_URI=""
-else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
- doc? (
- https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
- )"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="
- adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
- cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
- +lapack metis mpi muparser nanoflann opencascade p4est petsc
- scalapack slepc +sparse static-libs sundials symengine +tbb trilinos
-"
-
-# TODO: add slepc use flag once slepc is packaged for gentoo-science
-REQUIRED_USE="
- p4est? ( mpi )
- slepc? ( petsc )
- trilinos? ( mpi )"
-
-RDEPEND="dev-libs/boost
- app-arch/bzip2
- sys-libs/zlib
- adolc? ( sci-libs/adolc )
- arpack? ( sci-libs/arpack[mpi=] )
- assimp? ( media-libs/assimp )
- cuda? ( dev-util/nvidia-cuda-sdk )
- ginkgo? ( sci-libs/ginkgo )
- gmsh? ( sci-libs/gmsh )
- gsl? ( sci-libs/gsl:= )
- hdf5? ( sci-libs/hdf5[mpi=] )
- lapack? ( virtual/lapack )
- metis? (
- >=sci-libs/metis-5
- mpi? ( >=sci-libs/parmetis-4 )
- )
- mpi? ( virtual/mpi )
- muparser? ( dev-cpp/muParser )
- nanoflann? ( sci-libs/nanoflann )
- opencascade? ( sci-libs/opencascade:* )
- p4est? ( sci-libs/p4est[mpi] )
- petsc? ( sci-mathematics/petsc[mpi=] )
- scalapack? ( sci-libs/scalapack )
- slepc? ( sci-mathematics/slepc[mpi=] )
- sparse? ( sci-libs/umfpack )
- sundials? ( <sci-libs/sundials-4:= )
- symengine? ( >=sci-libs/symengine-0.4:= )
- tbb? ( dev-cpp/tbb )
- trilinos? ( sci-libs/trilinos )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] dev-lang/perl )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
- "${FILESDIR}"/${PN}-9.2.0-fix-boost-include-file.patch
-)
-
-src_configure() {
- # deal.II needs a custom build type:
- local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
-
- local mycmakeargs=(
- -DDEAL_II_PACKAGE_VERSION="${PV}"
- -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
- -DDEAL_II_ALLOW_AUTODETECTION=OFF
- -DDEAL_II_ALLOW_BUNDLED=OFF
- -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
- -DDEAL_II_COMPILE_EXAMPLES=OFF
- -DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
- -DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
- -DDEAL_II_COMPILE_EXAMPLES=OFF
- -DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
- -DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
- -DDEAL_II_SHARE_RELDIR="share/${PN}"
- -DDEAL_II_WITH_ZLIB=ON
- -DDEAL_II_WITH_ADOLC="$(usex adolc)"
- -DDEAL_II_WITH_ASSIMP="$(usex assimp)"
- -DDEAL_II_WITH_ARPACK="$(usex arpack)"
- -DDEAL_II_WITH_CUDA="$(usex cuda)"
- -DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
- -DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
- -DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
- -DDEAL_II_WITH_GMSH="$(usex gmsh)"
- -DDEAL_II_WITH_GSL="$(usex gsl)"
- -DDEAL_II_WITH_HDF5="$(usex hdf5)"
- -DDEAL_II_WITH_LAPACK="$(usex lapack)"
- -DDEAL_II_WITH_METIS="$(usex metis)"
- -DDEAL_II_WITH_MPI="$(usex mpi)"
- -DDEAL_II_WITH_MUPARSER="$(usex muparser)"
- -DDEAL_II_WITH_NANOFLANN="$(usex nanoflann)"
- -DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
- -DDEAL_II_WITH_P4EST="$(usex p4est)"
- -DDEAL_II_WITH_PETSC="$(usex petsc)"
- -DDEAL_II_WITH_SCALAPACK="$(usex scalapack)"
- -DDEAL_II_WITH_SLEPC="$(usex slepc)"
- -DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
- -DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
- -DDEAL_II_WITH_UMFPACK="$(usex sparse)"
- -DBUILD_SHARED_LIBS="$(usex !static-libs)"
- -DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
- -DDEAL_II_WITH_THREADS="$(usex tbb)"
- -DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
- )
-
- # Do a little dance for purely cosmetic "QA" reasons.
- use opencascade && mycmakeargs+=( -DOPENCASCADE_DIR="${CASROOT}" )
-
- # Do a little dance for purely cosmetic "QA" reasons. The build system
- # does query for the highest instruction set first and skips the other
- # variables if a "higher" variant is set
- if use cpu_flags_x86_avx512f; then
- mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
- elif use cpu_flags_x86_avx; then
- mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
- elif use cpu_flags_x86_avx; then
- mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- if use doc && [[ ${PV} != *9999* ]]; then
- # copy missing images to the build directory:
- cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
- "${BUILD_DIR}"/doc/doxygen/deal.II || die
- # replace links:
- sed -i \
- 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
- "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
- fi
- cmake-utils_src_install
-
- # decompress the installed example sources:
- use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch b/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
deleted file mode 100644
index 9fc6365d01c..00000000000
--- a/sci-libs/dealii/files/dealii-9.2.0-fix-boost-include-file.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9c1a580139f557433a226da437382b3f4307f7c8 Mon Sep 17 00:00:00 2001
-From: Luca Heltai <luca.heltai@sissa.it>
-Date: Wed, 30 Dec 2020 09:54:02 +0100
-Subject: [PATCH] Fix boost include file.
-
----
- source/fe/mapping.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/source/fe/mapping.cc b/source/fe/mapping.cc
-index 288a9debcb..4ef3ef7714 100644
---- a/source/fe/mapping.cc
-+++ b/source/fe/mapping.cc
-@@ -20,6 +20,8 @@
-
- #include <deal.II/grid/tria.h>
-
-+#include <boost/geometry.hpp>
-+
- DEAL_II_NAMESPACE_OPEN
-
-
---
-2.26.3
-
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index cfcb25d9e50..6bb4348a7cd 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -28,12 +28,10 @@ and extra output. If you want to get meaningful backtraces see
<flag name="opencascade">Add support for opencascade (<pkg>sci-libs/opencascade</pkg>)</flag>
<flag name="p4est">Add support for p4est (<pkg>sci-libs/p4est</pkg>)</flag>
<flag name="petsc">Add support for petsc (<pkg>sci-mathematics/petsc</pkg>)</flag>
- <flag name="nanoflann">Adds support for nanoflann (<pkg>sci-libs/nanoflann</pkg>)</flag>
<flag name="scalapack">Add support for ScaLAPACK (<pkg>sci-libs/scalapack</pkg>)</flag>
<flag name="slepc">Add support for slepc (<pkg>sci-mathematics/slepc</pkg>)</flag>
<flag name="sparse">Add support for suitesparse (<pkg>sci-libs/suitesparse</pkg>)</flag>
<flag name="symengine">Add support for symengine (<pkg>sci-libs/symengine</pkg>)</flag>
- <flag name="tbb">Add threading support with the help of the tbb library (<pkg>dev-cpp/tbb</pkg>)</flag>
<flag name="trilinos">Add support for trilinos (<pkg>sci-libs/trilinos</pkg>)</flag>
<flag name="assimp">Add support for assimp (<pkg>media-libs/assimp</pkg>)</flag>
<flag name="cuda">Add support for cuda (<pkg>dev-util/nvidia-cuda-sdk</pkg>)</flag>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/
@ 2022-01-04 21:49 Matthias Maier
0 siblings, 0 replies; 6+ messages in thread
From: Matthias Maier @ 2022-01-04 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 75b81c60327b92dedd6d8a072c170d9b87105402
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 4 19:16:48 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jan 4 21:49:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b81c60
sci-libs/dealii: fix build with boost 1.77
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
.../{dealii-9.3.1-r3.ebuild => dealii-9.3.1-r4.ebuild} | 5 +++--
sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch | 12 ++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/sci-libs/dealii/dealii-9.3.1-r3.ebuild b/sci-libs/dealii/dealii-9.3.1-r4.ebuild
similarity index 97%
rename from sci-libs/dealii/dealii-9.3.1-r3.ebuild
rename to sci-libs/dealii/dealii-9.3.1-r4.ebuild
index c52bce06b69d..ebe0f99102e4 100644
--- a/sci-libs/dealii/dealii-9.3.1-r3.ebuild
+++ b/sci-libs/dealii/dealii-9.3.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -45,7 +45,7 @@ REQUIRED_USE="
# accessible. Just fix the version for the time being.
CAS_VERSION=7.5.3
-RDEPEND="<dev-libs/boost-1.77.0:=
+RDEPEND="dev-libs/boost:=
app-arch/bzip2
sys-libs/zlib
dev-cpp/tbb:=
@@ -80,6 +80,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+ "${FILESDIR}"/${PN}-9.1.1-fix_boost_177.patch
)
src_configure() {
diff --git a/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch b/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch
new file mode 100644
index 000000000000..b040e240ad61
--- /dev/null
+++ b/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch
@@ -0,0 +1,12 @@
+diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h
+index 1b9d04d..1e1bfd2 100644
+--- a/include/deal.II/numerics/rtree.h
++++ b/include/deal.II/numerics/rtree.h
+@@ -26,6 +26,7 @@
+ #include <deal.II/boost_adaptors/segment.h>
+
+ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
++#include <boost/geometry/algorithms/distance.hpp>
+ #include <boost/geometry/index/rtree.hpp>
+ #include <boost/geometry/strategies/strategies.hpp>
+ DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/
@ 2022-12-08 4:39 Matthias Maier
0 siblings, 0 replies; 6+ messages in thread
From: Matthias Maier @ 2022-12-08 4:39 UTC (permalink / raw
To: gentoo-commits
commit: d0e16f9736fc7451c9a897a96b443b4b1270a20e
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 8 04:31:07 2022 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Dec 8 04:37:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e16f97
sci-libs/dealii: drop 9.3.1-r5, 9.3.3-r1
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/dealii/Manifest | 4 -
sci-libs/dealii/dealii-9.3.1-r5.ebuild | 161 ---------------------
sci-libs/dealii/dealii-9.3.3-r1.ebuild | 161 ---------------------
.../dealii/files/dealii-9.1.1-fix_boost_177.patch | 12 --
.../files/dealii-9.3.3-fix_p4est_detection.patch | 41 ------
5 files changed, 379 deletions(-)
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index da0abcfa16c1..6062fdd497e2 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,7 +1,3 @@
-DIST dealii-9.3.1-offline_documentation.tar.gz 342389060 BLAKE2B 71b47816dd22f490168f91c667308ecf10d5733bb4e4d6f7f214dfa729f47e6f44bf32382167f2f6c864038d04c994cab7ef91ae647b4188c53995c5c2904bf3 SHA512 7ab70b7821924a4383f2d46bcb44e702858206a8444870d3e2282d726b2c1cf3009f615888206312aed34eae9595ff19664da422e33c47720cce5c5fd37c1e18
-DIST dealii-9.3.1.tar.gz 24459280 BLAKE2B c7f1d461017da24efd6f3247217fd1b889e0cbf2ac62c3fd305e03aed90d5ba82b58ceb84d34a84608b833b734e12abc77a63693aaa6eed767b4f5f157233ba0 SHA512 c3ba3e16fa4792bb4f3e85163e67b08271c84faff72c49b858a955851401adf2499e278790803061a61c4024964f6da3f0ef7b09c0370d8d0b5af16b7c3bdaef
-DIST dealii-9.3.3-offline_documentation.tar.gz 346914833 BLAKE2B 8a3661f44aef70c25837fca67175e410f1404991a5fa3698d2e732f1ae045f987a3d9c2fb21294de32768533968e94178f7537f2c3221afdb427fb10478257b5 SHA512 05d8c9573e8277c88f81ff318d295b099e2241c5358cc243eaae35044703a8abc8cac7b7b8049b3527d167f60b11820bd8418fde2e6a6929c03abbf6cc5b6658
-DIST dealii-9.3.3.tar.gz 24462944 BLAKE2B 581a8c618fab96127ac95fe9ba5ea5410eb6f9193ce96b6a0d8d28dd125689fb11868115ae8163b7e223970321ddd75347ea21568ea1cdc1e783f94506f00d91 SHA512 31a05a2f539dd2336683c2ab887fef47f08a5127fe23163128036f3143c0c77dca08004b014704e1c7cc07d7578458636715dcbefd654e5fc4511d6d315b604d
DIST dealii-9.4.0-offline_documentation.tar.gz 390747598 BLAKE2B 6e8ed938b31a9e6bbbdd5baacce056edc31d489ecd3e9528283650f431d004ca122c968567fe342744d52bab8f8be53ab1b20d56636e2dc48f8cf551791a08bd SHA512 703eb50150ae5bd77f0d84271babd50483c3a9b069abb5b7e8827d00efaa5d189a43ac54f0ef8b2f746b12a10dc611669f5fddd655241a66af4915ec1d458185
DIST dealii-9.4.0-offline_documentation.tar.gz.asc 246 BLAKE2B cb828efcdb38b88af9abc3be95c90c126144ee1edd076e2c47c7a90dad1df3ac29ce104de7be551fb93671b0b3ffe44b737fcba3841ccb0921e1f0795360fec4 SHA512 59f8997f9a19580861f0c7afd06b9737519c0dbf6990c4569f5c8dbd05e7e41dce19d1b9a639504696be2f99f6e8c555086dcd85c43976ccd5c7ebf007864dc0
DIST dealii-9.4.0.tar.gz 30297914 BLAKE2B 6beb4c7b83f5316e703d4b77340900c376e622b1dc59c9058a8927174a8c6991994957588b6adf88238e72eec93f8941bfbfb2d0bb01070560468d051d9829f8 SHA512 3be740fbabff65a18870496f483ac4ed6d35c8a53b5128dd09b2dfabe82d60e4a75f02fd508b44f6c93805999aab98f551154f10ca2ad5fabede65c2d6dce320
diff --git a/sci-libs/dealii/dealii-9.3.1-r5.ebuild b/sci-libs/dealii/dealii-9.3.1-r5.ebuild
deleted file mode 100644
index 78407e89e17e..000000000000
--- a/sci-libs/dealii/dealii-9.3.1-r5.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# deal.II uses its own FindLAPACK.cmake file that calls into the system
-# FindLAPACK.cmake module and does additional internal setup. Do not remove
-# any of these modules:
-CMAKE_REMOVE_MODULES_LIST=""
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="https://www.dealii.org/"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dealii/dealii.git"
- SRC_URI=""
-else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
- doc? (
- https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
- )"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="
- adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
- cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
- +lapack metis mpi muparser opencascade p4est petsc
- scalapack slepc +sparse static-libs sundials symengine trilinos
-"
-
-# TODO: add slepc use flag once slepc is packaged for gentoo-science
-REQUIRED_USE="
- p4est? ( mpi )
- slepc? ( petsc )
- trilinos? ( mpi )"
-
-RDEPEND="dev-libs/boost:=
- app-arch/bzip2
- sys-libs/zlib
- dev-cpp/tbb:=
- adolc? ( sci-libs/adolc )
- arpack? ( sci-libs/arpack[mpi=] )
- assimp? ( media-libs/assimp:= )
- cuda? ( dev-util/nvidia-cuda-toolkit )
- ginkgo? ( sci-libs/ginkgo )
- gmsh? ( sci-libs/gmsh )
- gsl? ( sci-libs/gsl:= )
- hdf5? ( sci-libs/hdf5[mpi=] )
- lapack? ( virtual/lapack )
- metis? (
- >=sci-libs/metis-5
- mpi? ( >=sci-libs/parmetis-4 )
- )
- mpi? ( virtual/mpi[cxx] )
- muparser? ( dev-cpp/muParser )
- opencascade? ( sci-libs/opencascade:= )
- p4est? ( sci-libs/p4est[mpi] )
- petsc? ( sci-mathematics/petsc[mpi=] )
- scalapack? ( sci-libs/scalapack )
- slepc? ( sci-mathematics/slepc[mpi=] )
- sparse? ( sci-libs/umfpack )
- sundials? ( sci-libs/sundials:= )
- symengine? ( >=sci-libs/symengine-0.4:= )
- trilinos? ( sci-libs/trilinos )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] dev-lang/perl )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
- "${FILESDIR}"/${PN}-9.1.1-fix_boost_177.patch
-)
-
-src_configure() {
- # deal.II needs a custom build type:
- local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
-
- local mycmakeargs=(
- -DDEAL_II_PACKAGE_VERSION="${PV}"
- -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
- -DDEAL_II_ALLOW_AUTODETECTION=OFF
- -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
- -DDEAL_II_COMPILE_EXAMPLES=OFF
- -DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
- -DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
- -DDEAL_II_COMPILE_EXAMPLES=OFF
- -DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
- -DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
- -DDEAL_II_SHARE_RELDIR="share/${PN}"
- -DDEAL_II_WITH_ZLIB=ON
- -DDEAL_II_WITH_ADOLC="$(usex adolc)"
- -DDEAL_II_WITH_ASSIMP="$(usex assimp)"
- -DDEAL_II_WITH_ARPACK="$(usex arpack)"
- -DDEAL_II_WITH_CUDA="$(usex cuda)"
- -DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
- -DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
- -DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
- -DDEAL_II_WITH_GMSH="$(usex gmsh)"
- -DDEAL_II_WITH_GSL="$(usex gsl)"
- -DDEAL_II_WITH_HDF5="$(usex hdf5)"
- -DDEAL_II_WITH_LAPACK="$(usex lapack)"
- -DDEAL_II_WITH_METIS="$(usex metis)"
- -DDEAL_II_WITH_MPI="$(usex mpi)"
- -DDEAL_II_WITH_MUPARSER="$(usex muparser)"
- -DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
- -DDEAL_II_WITH_P4EST="$(usex p4est)"
- -DDEAL_II_WITH_PETSC="$(usex petsc)"
- -DDEAL_II_WITH_SCALAPACK="$(usex scalapack)"
- -DDEAL_II_WITH_SLEPC="$(usex slepc)"
- -DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
- -DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
- -DDEAL_II_WITH_UMFPACK="$(usex sparse)"
- -DBUILD_SHARED_LIBS="$(usex !static-libs)"
- -DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
- -DDEAL_II_WITH_TBB=ON
- -DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
- )
-
- use opencascade && mycmakeargs+=(
- -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade"
- )
-
- # Do a little dance for purely cosmetic QA reasons. The build system
- # does query for the highest instruction set first and skips the other
- # variables if a "higher" variant is set
- if use cpu_flags_x86_avx512f; then
- mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
- append-cxxflags "-mavx512f"
- elif use cpu_flags_x86_avx; then
- mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
- append-cxxflags "-mavx2"
- elif use cpu_flags_x86_avx; then
- mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
- append-cxxflags "-msse2"
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- if use doc && [[ ${PV} != *9999* ]]; then
- # copy missing images to the build directory:
- cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
- "${BUILD_DIR}"/doc/doxygen/deal.II || die
- # replace links:
- sed -i \
- 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
- "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
- fi
- cmake_src_install
-
- # decompress the installed example sources:
- use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-libs/dealii/dealii-9.3.3-r1.ebuild b/sci-libs/dealii/dealii-9.3.3-r1.ebuild
deleted file mode 100644
index a093157e2d71..000000000000
--- a/sci-libs/dealii/dealii-9.3.3-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# deal.II uses its own FindLAPACK.cmake file that calls into the system
-# FindLAPACK.cmake module and does additional internal setup. Do not remove
-# any of these modules:
-CMAKE_REMOVE_MODULES_LIST=""
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Solving partial differential equations with the finite element method"
-HOMEPAGE="https://www.dealii.org/"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/dealii/dealii.git"
- SRC_URI=""
-else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
- doc? (
- https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
- )"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="
- adolc assimp arpack cpu_flags_x86_avx cpu_flags_x86_avx512f
- cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5
- +lapack metis mpi muparser opencascade p4est petsc
- scalapack slepc +sparse static-libs sundials symengine trilinos
-"
-
-# TODO: add slepc use flag once slepc is packaged for gentoo-science
-REQUIRED_USE="
- p4est? ( mpi )
- slepc? ( petsc )
- trilinos? ( mpi )"
-
-RDEPEND="dev-libs/boost:=
- app-arch/bzip2
- sys-libs/zlib
- dev-cpp/tbb:=
- adolc? ( sci-libs/adolc )
- arpack? ( sci-libs/arpack[mpi=] )
- assimp? ( media-libs/assimp:= )
- cuda? ( dev-util/nvidia-cuda-toolkit )
- ginkgo? ( sci-libs/ginkgo )
- gmsh? ( sci-libs/gmsh )
- gsl? ( sci-libs/gsl:= )
- hdf5? ( sci-libs/hdf5[mpi=] )
- lapack? ( virtual/lapack )
- metis? (
- >=sci-libs/metis-5
- mpi? ( >=sci-libs/parmetis-4 )
- )
- mpi? ( virtual/mpi[cxx] )
- muparser? ( dev-cpp/muParser )
- opencascade? ( sci-libs/opencascade:= )
- p4est? ( sci-libs/p4est[mpi] )
- petsc? ( sci-mathematics/petsc[mpi=] )
- scalapack? ( sci-libs/scalapack )
- slepc? ( sci-mathematics/slepc[mpi=] )
- sparse? ( sci-libs/umfpack )
- sundials? ( sci-libs/sundials:= )
- symengine? ( >=sci-libs/symengine-0.4:= )
- trilinos? ( sci-libs/trilinos )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] dev-lang/perl )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
- "${FILESDIR}"/${P}-fix_p4est_detection.patch
-)
-
-src_configure() {
- # deal.II needs a custom build type:
- local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release)
-
- local mycmakeargs=(
- -DDEAL_II_PACKAGE_VERSION="${PV}"
- -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF
- -DDEAL_II_ALLOW_AUTODETECTION=OFF
- -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF
- -DDEAL_II_COMPILE_EXAMPLES=OFF
- -DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html"
- -DDEAL_II_DOCREADME_RELDIR="share/doc/${P}"
- -DDEAL_II_COMPILE_EXAMPLES=OFF
- -DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples"
- -DDEAL_II_LIBRARY_RELDIR="$(get_libdir)"
- -DDEAL_II_SHARE_RELDIR="share/${PN}"
- -DDEAL_II_WITH_ZLIB=ON
- -DDEAL_II_WITH_ADOLC="$(usex adolc)"
- -DDEAL_II_WITH_ASSIMP="$(usex assimp)"
- -DDEAL_II_WITH_ARPACK="$(usex arpack)"
- -DDEAL_II_WITH_CUDA="$(usex cuda)"
- -DDEAL_II_WITH_GINKGO="$(usex ginkgo)"
- -DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)"
- -DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)"
- -DDEAL_II_WITH_GMSH="$(usex gmsh)"
- -DDEAL_II_WITH_GSL="$(usex gsl)"
- -DDEAL_II_WITH_HDF5="$(usex hdf5)"
- -DDEAL_II_WITH_LAPACK="$(usex lapack)"
- -DDEAL_II_WITH_METIS="$(usex metis)"
- -DDEAL_II_WITH_MPI="$(usex mpi)"
- -DDEAL_II_WITH_MUPARSER="$(usex muparser)"
- -DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)"
- -DDEAL_II_WITH_P4EST="$(usex p4est)"
- -DDEAL_II_WITH_PETSC="$(usex petsc)"
- -DDEAL_II_WITH_SCALAPACK="$(usex scalapack)"
- -DDEAL_II_WITH_SLEPC="$(usex slepc)"
- -DDEAL_II_WITH_SUNDIALS="$(usex sundials)"
- -DDEAL_II_WITH_SYMENGINE="$(usex symengine)"
- -DDEAL_II_WITH_UMFPACK="$(usex sparse)"
- -DBUILD_SHARED_LIBS="$(usex !static-libs)"
- -DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)"
- -DDEAL_II_WITH_TBB=ON
- -DDEAL_II_WITH_TRILINOS="$(usex trilinos)"
- )
-
- use opencascade && mycmakeargs+=(
- -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade"
- )
-
- # Do a little dance for purely cosmetic QA reasons. The build system
- # does query for the highest instruction set first and skips the other
- # variables if a "higher" variant is set
- if use cpu_flags_x86_avx512f; then
- mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes )
- append-cxxflags "-mavx512f"
- elif use cpu_flags_x86_avx; then
- mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes )
- append-cxxflags "-mavx2"
- elif use cpu_flags_x86_avx; then
- mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes )
- append-cxxflags "-msse2"
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- if use doc && [[ ${PV} != *9999* ]]; then
- # copy missing images to the build directory:
- cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \
- "${BUILD_DIR}"/doc/doxygen/deal.II || die
- # replace links:
- sed -i \
- 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \
- "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed"
- fi
- cmake_src_install
-
- # decompress the installed example sources:
- use examples && docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch b/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch
deleted file mode 100644
index b040e240ad61..000000000000
--- a/sci-libs/dealii/files/dealii-9.1.1-fix_boost_177.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/deal.II/numerics/rtree.h b/include/deal.II/numerics/rtree.h
-index 1b9d04d..1e1bfd2 100644
---- a/include/deal.II/numerics/rtree.h
-+++ b/include/deal.II/numerics/rtree.h
-@@ -26,6 +26,7 @@
- #include <deal.II/boost_adaptors/segment.h>
-
- DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
-+#include <boost/geometry/algorithms/distance.hpp>
- #include <boost/geometry/index/rtree.hpp>
- #include <boost/geometry/strategies/strategies.hpp>
- DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
diff --git a/sci-libs/dealii/files/dealii-9.3.3-fix_p4est_detection.patch b/sci-libs/dealii/files/dealii-9.3.3-fix_p4est_detection.patch
deleted file mode 100644
index 72d66d7ecb4d..000000000000
--- a/sci-libs/dealii/files/dealii-9.3.3-fix_p4est_detection.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 354cdd6730ac1cc19cbf99e663e7ca280a9b62dc Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@43-1.org>
-Date: Sun, 13 Feb 2022 19:03:49 -0600
-Subject: [PATCH] CMake: Adjust MPI and ZLIB support query for p4est version
- 2.8
-
----
- cmake/modules/FindP4EST.cmake | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/FindP4EST.cmake b/cmake/modules/FindP4EST.cmake
-index a91ef26876..d32cadf281 100644
---- a/cmake/modules/FindP4EST.cmake
-+++ b/cmake/modules/FindP4EST.cmake
-@@ -114,7 +114,13 @@ IF(EXISTS ${P4EST_INCLUDE_DIR}/p4est_config.h)
- FILE(STRINGS "${P4EST_INCLUDE_DIR}/p4est_config.h" P4EST_MPI_STRING
- REGEX "#define.*P4EST_MPI 1")
- IF("${P4EST_MPI_STRING}" STREQUAL "")
-- SET(P4EST_WITH_MPI FALSE)
-+ FILE(STRINGS "${P4EST_INCLUDE_DIR}/p4est_config.h" P4EST_MPI_STRING
-+ REGEX "#define.*P4EST_ENABLE_MPI")
-+ IF("${P4EST_MPI_STRING}" STREQUAL "")
-+ SET(P4EST_WITH_MPI FALSE)
-+ ELSE()
-+ SET(P4EST_WITH_MPI TRUE)
-+ ENDIF()
- ELSE()
- SET(P4EST_WITH_MPI TRUE)
- ENDIF()
-@@ -123,7 +129,7 @@ IF(EXISTS ${P4EST_INCLUDE_DIR}/p4est_config.h)
- # Is p4est built against zlib?
- #
- FILE(STRINGS "${P4EST_INCLUDE_DIR}/p4est_config.h" P4EST_ZLIB_STRING
-- REGEX "#define.*P4EST_HAVE_ZLIB 1")
-+ REGEX "^#define.*P4EST_HAVE_ZLIB")
- IF("${P4EST_ZLIB_STRING}" STREQUAL "")
- SET(P4EST_WITH_ZLIB FALSE)
- ELSE()
---
-2.34.1
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/
@ 2024-02-16 1:03 Matthias Maier
0 siblings, 0 replies; 6+ messages in thread
From: Matthias Maier @ 2024-02-16 1:03 UTC (permalink / raw
To: gentoo-commits
commit: 71634c39d291459439fadb16adfb9506278d2835
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 00:55:22 2024 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 00:59:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71634c39
sci-libs/dealii: add 9.4.2, drop 9.4.1-r1
- apply mpich fix
Bug: https://bugs.gentoo.org/920556
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
sci-libs/dealii/Manifest | 4 +-
...{dealii-9.4.1-r1.ebuild => dealii-9.4.2.ebuild} | 7 ++-
...-remove-superfluous-explicit-instantiatio.patch | 59 ++++++++++++++++++++++
...mark-a-template-variable-to-have-const-in.patch | 28 ++++++++++
4 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest
index 3ac62d91cec5..060460e46f39 100644
--- a/sci-libs/dealii/Manifest
+++ b/sci-libs/dealii/Manifest
@@ -1,7 +1,7 @@
DIST dealii-9.4.1-offline_documentation.tar.gz 392007419 BLAKE2B 81404b02ba7dc97a0314f52fa9d775183981864288f4ab4ca81b550a1763d90cb5b04b32c056008ad60a7829b929c78edd80cbeeeb861e4ef638780c13d80aa7 SHA512 9bbaf6e9a478ac643e87f2f07918c8a5216e17b0ddaeba4beb2acde9ea54833e2f0e7d11f61b2cac8b986e442dbb181317b53e1a40a807e7c098167bfd073266
DIST dealii-9.4.1-offline_documentation.tar.gz.asc 246 BLAKE2B 9ace22c9b174e642cd3fba94c165d816c62814f892f5f6f272efa0301613dc55251152825e726fc6cf7e89bbfb7fa3552ec58ad426a7d58a74ecb89b9072f742 SHA512 50b43dd34a0687395f516f4910581df71054fa8be3c98006566ea649d0af866d38c9793da548ba6bdb7a9fec452dfb6d928d336aace943522d7c3f854209b81b
-DIST dealii-9.4.1.tar.gz 30298204 BLAKE2B 499f542c7a7f071d04048127199c7bebf5668b6e8d13fc2701dd18e28165442e58112ee9e4926e16a592bffdd5d7b7c240eea55808e5f9c021961f7e44b7da79 SHA512 39089aff462d3ff4244ce75f74a4cd908f8f72a81dcc3fb02ca91b3cad2442ceb78677e72cd928b36a04d352c4baa146a25fa5e14c886ca9e2bad0be0069f7b8
-DIST dealii-9.4.1.tar.gz.asc 246 BLAKE2B dbb1dc7b3e8a97f29287f154d11cd3db2566fdc4c7667fa57e686e2feba33f2115546408365f0e8f490ba593cb582b12489de373da3e33e8702b6e16804c7ebf SHA512 eb987d34f19b59d523d79f3c2c99f5f3125b1d0c71af0eb32b77ad5959d6197b79f1971a8a79dbc52bab698335dcb6091aac88c51d845a1e07d3681c089754c7
+DIST dealii-9.4.2.tar.gz 30298479 BLAKE2B bff5dd5a1b5458dd6e295b87cee9d24626ffce0b4c6a3329f190739d8fc67d34f11f0218dbbcd69dcf2e031e3e9f04cd1f2d0768d2fad32198bf1360d132a686 SHA512 6f6f032f6eef73421b53576e01f40bef0b4ce3d89583a016d057f8ec023c1f925a5c245991fd4639f9e73c4852d5cfd36da92258251a56179a98cd4a612cac9f
+DIST dealii-9.4.2.tar.gz.asc 246 BLAKE2B b61a8e3e496ba34c87fe453fbcec9fd0fb0d59f8d7123f38352c65c81b3d0ea706a4f645444970857a9fd67a26a984fc5adcfe8ed6c43eae5656bba6dd3bed9e SHA512 b11a79da7eeaababf7ec2c2264b41d0a5df9fd2f870829c535f888f0f8c07a6765920e023fd9d74f24a5a4744bd8d68a6db1669e449ed1a81757ee6c3c60b873
DIST dealii-9.5.0-offline_documentation.tar.gz 412499027 BLAKE2B 521aa2488d84d48a624f4cbdbe9c173d0cdcee2df8d06b97b7c25ba28d4a2113a7da9fd9abd9eb64cd56b37f8edc716bd034fc3ba8823f8b1def26c34aaeeb55 SHA512 2e0d331f92d52b0fd909a0139157a1960a9222d46d537611f0508cdb79020a8e51ff0da6aefdf95adff732cea050b72df7dc1a8af7e93c736721970218815cfe
DIST dealii-9.5.0-offline_documentation.tar.gz.asc 246 BLAKE2B 0a570885e80ad09ff154532b71c07e33894e93c96b3bca48dc8aae0b308883518cbb5eca57658c4e13de47efba47c3cb20bf376482ef7a26c6c0da93ee4dd689 SHA512 b63a9a0504fe5266b448ffda74e1d85ad5b6f344535c5b5f11d209546b51bb916ad69504ce5e4f1fd2287407c2d3d98a20b01bd830e8d45f510a85b7a057a8d5
DIST dealii-9.5.1.tar.gz 31522808 BLAKE2B 99db2beafb949364869fc7f06f78bf921b0d99c69de57da40115b0eb939e1c9a40dcbf40a186a988189ea92a6e1295da4969fd33a7e4738b27813ff1842cb99a SHA512 7ba4e4751417a7916cb059379b3b70afcaa5f62786e92ac7332b6f55cbcfcb25df15de2a6071cc33444c911f104e576f8792ea4ac4e6702186e5740c7c909d72
diff --git a/sci-libs/dealii/dealii-9.4.1-r1.ebuild b/sci-libs/dealii/dealii-9.4.2.ebuild
similarity index 94%
rename from sci-libs/dealii/dealii-9.4.1-r1.ebuild
rename to sci-libs/dealii/dealii-9.4.2.ebuild
index e85fd0205e74..fd2fc4b43f39 100644
--- a/sci-libs/dealii/dealii-9.4.1-r1.ebuild
+++ b/sci-libs/dealii/dealii-9.4.2.ebuild
@@ -18,11 +18,12 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/dealii/dealii.git"
SRC_URI=""
else
+ DOC_PV=9.4.1
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz
verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz.asc )
doc? (
- https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz
- verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz.asc )
+ https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz
+ verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz.asc )
)"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
fi
@@ -82,6 +83,8 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch
+ "${FILESDIR}"/${PN}-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch
+ "${FILESDIR}"/${PN}-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch
)
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/dealii.asc"
diff --git a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch
new file mode 100644
index 000000000000..85a78c4c1326
--- /dev/null
+++ b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch
@@ -0,0 +1,59 @@
+From aafc2c19dfd3ebc43e37ba3f13eda5f790376b1c Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Thu, 15 Feb 2024 15:54:36 -0600
+Subject: [PATCH 1/2] base/mpi.cc: remove superfluous explicit instantiations
+ of template variable
+
+The `mpi.h` header already contains:
+```
+template <typename T>
+const MPI_Datatype mpi_type_id_for_type = /* implementation detail */;
+```
+Meaning, the variable is known fully after including the header.
+Furthermore, the `const` qualifier marks the (template) variable as
+`static`. I.e., it has internal linkage.
+
+Thus, we must not explicitly instantiate the variables (suggesting
+"extern" linkage in all but the `mpi.cc` compilation unit). This
+apparently not an issue with OpenMPI because `MPI_Datatype` is a
+complex data structure. But it is an issue with mpich where
+`MPI_Datatype` is a simple `int` - leading to a segmentation fault when
+during program startup.
+---
+ source/base/mpi.cc | 20 --------------------
+ 1 file changed, 20 deletions(-)
+
+diff --git a/source/base/mpi.cc b/source/base/mpi.cc
+index dab88e2b97..f845845764 100644
+--- a/source/base/mpi.cc
++++ b/source/base/mpi.cc
+@@ -100,26 +100,6 @@ namespace Utilities
+
+ namespace MPI
+ {
+-#ifdef DEAL_II_WITH_MPI
+- // Provide definitions of template variables for all valid instantiations.
+- template const MPI_Datatype mpi_type_id_for_type<bool>;
+- template const MPI_Datatype mpi_type_id_for_type<char>;
+- template const MPI_Datatype mpi_type_id_for_type<signed char>;
+- template const MPI_Datatype mpi_type_id_for_type<short>;
+- template const MPI_Datatype mpi_type_id_for_type<int>;
+- template const MPI_Datatype mpi_type_id_for_type<long int>;
+- template const MPI_Datatype mpi_type_id_for_type<unsigned char>;
+- template const MPI_Datatype mpi_type_id_for_type<unsigned short>;
+- template const MPI_Datatype mpi_type_id_for_type<unsigned long int>;
+- template const MPI_Datatype mpi_type_id_for_type<unsigned long long int>;
+- template const MPI_Datatype mpi_type_id_for_type<float>;
+- template const MPI_Datatype mpi_type_id_for_type<double>;
+- template const MPI_Datatype mpi_type_id_for_type<long double>;
+- template const MPI_Datatype mpi_type_id_for_type<std::complex<float>>;
+- template const MPI_Datatype mpi_type_id_for_type<std::complex<double>>;
+-#endif
+-
+-
+ MinMaxAvg
+ min_max_avg(const double my_value, const MPI_Comm mpi_communicator)
+ {
+--
+2.43.0
+
diff --git a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch
new file mode 100644
index 000000000000..032b12237bd2
--- /dev/null
+++ b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch
@@ -0,0 +1,28 @@
+From 2ef67e3896a2a7d0ba93539cf79310384470fc91 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Thu, 15 Feb 2024 16:03:22 -0600
+Subject: [PATCH 2/2] base/mpi.h: mark a template variable to have "const
+ inline" linkage.
+
+---
+ include/deal.II/base/mpi.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/deal.II/base/mpi.h b/include/deal.II/base/mpi.h
+index b77fd3e7c8..8ee55fbe41 100644
+--- a/include/deal.II/base/mpi.h
++++ b/include/deal.II/base/mpi.h
+@@ -1728,8 +1728,8 @@ namespace Utilities
+ * not satisfied.
+ */
+ template <typename T>
+- const MPI_Datatype
+- mpi_type_id_for_type = internal::MPIDataTypes::mpi_type_id(
++ inline const MPI_Datatype mpi_type_id_for_type =
++ internal::MPIDataTypes::mpi_type_id(
+ static_cast<std::remove_cv_t<std::remove_reference_t<T>> *>(nullptr));
+ #endif
+
+--
+2.43.0
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-16 1:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-27 19:47 [gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/ Matthias Maier
-- strict thread matches above, loose matches on Subject: below --
2024-02-16 1:03 Matthias Maier
2022-12-08 4:39 Matthias Maier
2022-01-04 21:49 Matthias Maier
2021-09-07 16:19 Andreas Sturmlechner
2019-08-05 13:30 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox