From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1368624-garchives=archives.gentoo.org@lists.gentoo.org>
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 D318D15808B
for <garchives@archives.gentoo.org>; Fri, 18 Feb 2022 03:07:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C1D1A2BC014;
Fri, 18 Feb 2022 03:07:13 +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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9BF7F2BC014
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Feb 2022 03:07:13 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A2165343368
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Feb 2022 03:07:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B730F30C
for <gentoo-commits@lists.gentoo.org>; Fri, 18 Feb 2022 03:07:00 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1645153553.01f352b1649fc560c6cea09b91e72e56b49f6f68.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/flann/flann-1.9.1-r5.ebuild
X-VCS-Directories: sci-libs/flann/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 01f352b1649fc560c6cea09b91e72e56b49f6f68
X-VCS-Branch: master
Date: Fri, 18 Feb 2022 03:07:00 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0e88aeb4-9758-49c6-853d-2e4df6bf2fd5
X-Archives-Hash: 1725bf1ecdf44e72c89e22bdaa8e746a
commit: 01f352b1649fc560c6cea09b91e72e56b49f6f68
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Wed Feb 16 22:13:25 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 03:05:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f352b1
sci-libs/flann: fix RUNPATH with MPI
Bug: https://bugs.gentoo.org/795828
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24221
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/flann/flann-1.9.1-r5.ebuild | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r5.ebuild
index 716c7a4fec72..788c2733be10 100644
--- a/sci-libs/flann/flann-1.9.1-r5.ebuild
+++ b/sci-libs/flann/flann-1.9.1-r5.ebuild
@@ -17,6 +17,7 @@ IUSE="cuda doc examples mpi octave openmp"
BDEPEND="
app-arch/unzip
doc? ( dev-tex/latex2html )
+ mpi? ( app-admin/chrpath )
"
DEPEND="
app-arch/lz4:=
@@ -85,4 +86,9 @@ src_configure() {
src_install() {
cmake_src_install
find "${D}" -name 'lib*.a' -delete || die
+
+ # bug 795828; mpicc volunterely adds some runpaths
+ if use mpi; then
+ chrpath -d "${ED}"/usr/bin/flann_mpi_{client,server} || die
+ fi
}