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 49B4B15814C for ; Fri, 27 Oct 2023 02:34:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A1522BC09E; Fri, 27 Oct 2023 02:34:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1B4CF2BC0A0 for ; Fri, 27 Oct 2023 02:34:48 +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 25A83335C7E for ; Fri, 27 Oct 2023 02:34:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50EB512CC for ; Fri, 27 Oct 2023 02:34:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1698373839.16eaba9bc57ea1d0fd90045de20d4de98ca8a052.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/files/, sci-libs/cantera/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/cantera/cantera-3.0.0.ebuild sci-libs/cantera/files/cantera-3.0.0_env.patch X-VCS-Directories: sci-libs/cantera/ sci-libs/cantera/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 16eaba9bc57ea1d0fd90045de20d4de98ca8a052 X-VCS-Branch: master Date: Fri, 27 Oct 2023 02:34:45 +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: 728eb39c-73ec-44e2-aa46-69d43cbff94c X-Archives-Hash: b5dfc91611745bef04460ebc650bfd8e commit: 16eaba9bc57ea1d0fd90045de20d4de98ca8a052 Author: Sergey Torokhov yandex ru> AuthorDate: Mon Oct 16 22:29:52 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Oct 27 02:30:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16eaba9b sci-libs/cantera: 3.0, mv libcantera_python3_XY.so to /usr/lib*/cantera Change installation path of libcantera_python3_XY.so plugin from "/usr/$(get_libdir)" to "/usr/$(get_libdir)/cantera" directory and add new direcotry to RPATH to properly working of dlopen() to load plugin from C++ user's code. Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/32595 Signed-off-by: Sam James gentoo.org> sci-libs/cantera/cantera-3.0.0.ebuild | 4 ++-- sci-libs/cantera/files/cantera-3.0.0_env.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sci-libs/cantera/cantera-3.0.0.ebuild b/sci-libs/cantera/cantera-3.0.0.ebuild index efc3e6149962..27478930c415 100644 --- a/sci-libs/cantera/cantera-3.0.0.ebuild +++ b/sci-libs/cantera/cantera-3.0.0.ebuild @@ -63,8 +63,6 @@ DEPEND=" ) " -QA_SONAME="usr/lib.*/libcantera_python3.*.so" # intended for dlopen() - PATCHES=( "${FILESDIR}/${P}_env.patch" ) @@ -98,6 +96,8 @@ src_configure() { system_blas_lapack=$(usex lapack y n) env_vars="all" extra_inc_dirs="/usr/include/eigen3" + use_rpath_linkage="yes" + extra_lib_dirs="/usr/$(get_libdir)/${PN}" ) use hdf5 && scons_vars+=( system_highfive="y" ) use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" ) diff --git a/sci-libs/cantera/files/cantera-3.0.0_env.patch b/sci-libs/cantera/files/cantera-3.0.0_env.patch index 786df7140632..cfc2874250e4 100644 --- a/sci-libs/cantera/files/cantera-3.0.0_env.patch +++ b/sci-libs/cantera/files/cantera-3.0.0_env.patch @@ -23,3 +23,15 @@ diff -Naur a/SConstruct b/SConstruct # Print values of all build options: # the (updated) "cantera.conf" combines all options that were specified by the user +diff -Naur a/src/SConscript b/src/SConscript +--- a/src/SConscript ++++ b/src/SConscript +@@ -89,7 +89,7 @@ + shim = pyenv.SharedObject("extensions/pythonShim.cpp") + pylibname = f"../lib/cantera_python{pyenv['py_version_short'].replace('.', '_')}" + lib = build(pyenv.SharedLibrary(pylibname, shim, SPAWN=get_spawn(pyenv))) +- install("$inst_shlibdir", lib) ++ install("$inst_shlibdir/cantera", lib) + + + # build the Cantera static library