From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B9611138335 for ; Mon, 5 Aug 2019 13:30:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7ACC9E0815; Mon, 5 Aug 2019 13:30:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DEC57E0814 for ; Mon, 5 Aug 2019 13:30:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 484F8349B84 for ; Mon, 5 Aug 2019 13:30:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3883C741 for ; Mon, 5 Aug 2019 13:30:34 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1565011407.73a1cbc09af77b0f795d04b4e3a3bf3629b3177f.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/dealii/, sci-libs/dealii/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/dealii/dealii-9.1.1.ebuild sci-libs/dealii/dealii-9999.ebuild sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch X-VCS-Directories: sci-libs/dealii/files/ sci-libs/dealii/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 73a1cbc09af77b0f795d04b4e3a3bf3629b3177f X-VCS-Branch: master Date: Mon, 5 Aug 2019 13:30:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6add4cd3-3cae-42fc-a44c-4e7385228d20 X-Archives-Hash: 45d7af1215a9e0f1c39911ecb6a0ee78 commit: 73a1cbc09af77b0f795d04b4e3a3bf3629b3177f Author: Matthias Maier gentoo org> AuthorDate: Mon Aug 5 12:06:17 2019 +0000 Commit: Matthias Maier gentoo 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 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@