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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E8105158013 for ; Thu, 7 Dec 2023 05:23:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3F552BC01B; Thu, 7 Dec 2023 05:23:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C6F072BC01F for ; Thu, 7 Dec 2023 05:23:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E57033D0AF for ; Thu, 7 Dec 2023 05:23:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B838C1448 for ; Thu, 7 Dec 2023 05:23: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: <1701923312.2ecd1110e3b70f751b8763a5146916e704adc926.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/trilinos/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/trilinos/trilinos-14.4.0.ebuild sci-libs/trilinos/trilinos-15.0.0.ebuild X-VCS-Directories: sci-libs/trilinos/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 2ecd1110e3b70f751b8763a5146916e704adc926 X-VCS-Branch: master Date: Thu, 7 Dec 2023 05:23: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: c255e32d-9fa7-4110-95fc-55ecae053e7a X-Archives-Hash: 338c0a3b8b85241565dea018ae64a5a7 commit: 2ecd1110e3b70f751b8763a5146916e704adc926 Author: Matthias Maier gentoo org> AuthorDate: Wed Dec 6 17:33:59 2023 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu Dec 7 04:28:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ecd1110 sci-libs/trilinos: various QA fixes - remove obsolete configuration options - filter lto flags - disable RPATH handling - reenable SEACAS Closes: https://bugs.gentoo.org/851489 Closes: https://bugs.gentoo.org/862987 Closes: https://bugs.gentoo.org/823434 Signed-off-by: Matthias Maier gentoo.org> sci-libs/trilinos/trilinos-14.4.0.ebuild | 11 +++++++---- sci-libs/trilinos/trilinos-15.0.0.ebuild | 19 ++++--------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/sci-libs/trilinos/trilinos-14.4.0.ebuild b/sci-libs/trilinos/trilinos-14.4.0.ebuild index 8e143ef76619..709a6fdc1fe0 100644 --- a/sci-libs/trilinos/trilinos-14.4.0.ebuild +++ b/sci-libs/trilinos/trilinos-14.4.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 CMAKE_MAKEFILE_GENERATOR=emake -inherit cmake toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs DESCRIPTION="Scientific library collection for large scale problems" HOMEPAGE="http://trilinos.sandia.gov/" @@ -94,18 +94,21 @@ trilinos_conf() { # # The following packages are currently disabled: -# - Adelus/Zadelus due to underlinkage. -# - Moertel due to underlinkage # - SEACAS is incompatible with netcdf, see # https://github.com/trilinos/Trilinos/tree/master/packages/seacas#netcdf # src_configure() { + # Trilinos is a massive C++ project. Fixing all of the lto warnings and + # making safe for lto compilation/linking will be a massive + # undertaking. Thus, simply filter lto flags. bug #862987 + filter-lto + local mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="${EPREFIX}" + -DCMAKE_SKIP_RPATH=ON -DCMAKE_SKIP_INSTALL_RPATH=ON - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" -DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)" diff --git a/sci-libs/trilinos/trilinos-15.0.0.ebuild b/sci-libs/trilinos/trilinos-15.0.0.ebuild index 86d691392b39..2d104e3e9ce2 100644 --- a/sci-libs/trilinos/trilinos-15.0.0.ebuild +++ b/sci-libs/trilinos/trilinos-15.0.0.ebuild @@ -92,32 +92,21 @@ trilinos_conf() { [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" ) } -# -# The following packages are currently disabled: -# - Adelus/Zadelus due to underlinkage. -# - Moertel due to underlinkage -# - SEACAS is incompatible with netcdf, see -# https://github.com/trilinos/Trilinos/tree/master/packages/seacas#netcdf -# - src_configure() { - # Trilinos is a massive CPP project. Fixing all of the lto warnings and - # making lto compilation/linking save will be a massive undertaking. - # Thus, simply filter lto flags. bug #862987 + # Trilinos is a massive C++ project. Fixing all of the lto warnings and + # making safe for lto compilation/linking will be a massive + # undertaking. Thus, simply filter lto flags. bug #862987 filter-lto local mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="${EPREFIX}" + -DCMAKE_SKIP_RPATH=ON -DCMAKE_SKIP_INSTALL_RPATH=ON - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" -DTrilinos_ENABLE_ALL_PACKAGES="$(usex all-packages)" - -DTrilinos_ENABLE_Adelus=OFF - -DTrilinos_ENABLE_Moertel=OFF -DTrilinos_ENABLE_PyTrilinos=OFF - -DTrilinos_ENABLE_SEACAS=OFF -DTrilinos_ENABLE_Amesos=ON -DTrilinos_ENABLE_AztecOO=ON -DTrilinos_ENABLE_EpetraExt=ON