[gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Matthias Maier" <tamiko@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/
Date: Mon,  5 Aug 2019 13:30:34 +0000 (UTC)	[thread overview]
Message-ID: <1565011407.73a1cbc09af77b0f795d04b4e3a3bf3629b3177f.tamiko@gentoo> (raw)

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@

next             reply	other threads:[~2019-08-05 13:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-05 13:30 Matthias Maier [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-04-27 19:47 [gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/ Matthias Maier
2021-09-07 16:19 Andreas Sturmlechner
2022-01-04 21:49 Matthias Maier
2022-12-08  4:39 Matthias Maier
2024-02-16  1:03 Matthias Maier

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:0da4f8ea6e dfblob:719f781973 dfblob:0da4f8ea6e
dfblob:719f781973 dfblob:69c2c09e67 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1565011407.73a1cbc09af77b0f795d04b4e3a3bf3629b3177f.tamiko@gentoo \
    --to=tamiko@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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