[gentoo-commits] repo/gentoo:master commit in: dev-cpp/tbb/

[Fabian Groffen]

commit:     5bfd22c5b483ee6b15d3dfba66b6a8256d7c415e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 13:34:53 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 13:34:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bfd22c5

dev-cpp/tbb: use get_libname to deal with the right files, bug #638526

Thanks Anton for the suggestion.

Closes: https://bugs.gentoo.org/638526
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-cpp/tbb/tbb-2017.20170226.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-cpp/tbb/tbb-2017.20170226.ebuild b/dev-cpp/tbb/tbb-2017.20170226.ebuild
index 62fadf88307..187f9ac0615 100644
--- a/dev-cpp/tbb/tbb-2017.20170226.ebuild
+++ b/dev-cpp/tbb/tbb-2017.20170226.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils flag-o-matic multilib-minimal toolchain-funcs versionator
+inherit eutils flag-o-matic multilib-minimal multilib toolchain-funcs versionator
 
 PV1="$(get_version_component_range 1)"
 PV2=5
@@ -117,10 +117,10 @@ multilib_src_install() {
 	for bt in ${buildtypes}; do
 		cd "${BUILD_DIR}_${bt}" || die
 		local l
-		for l in $(find . -name lib\*.so.\*); do
+		for l in $(find . -name lib\*$(get_libname \*)); do
 			dolib.so ${l}
 			local bl=$(basename ${l})
-			dosym ${bl} /usr/$(get_libdir)/${bl%.*}
+			dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname)
 		done
 	done