| 1 |
commit: cbf63d4ff309ea168dc40e7886f535cbd11c1bfa |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Mar 28 00:19:01 2021 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 29 14:43:22 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf63d4f |
| 7 |
|
| 8 |
dev-libs/ocl-icd: Fix ruby BDEP selection |
| 9 |
|
| 10 |
The Makefile sets RUBY=ruby. The active ruby interpreter set via |
| 11 |
eselect may not correspond to one that satisfies ${RUBY_DEPS}. Test |
| 12 |
for the existence of a versioned ruby from among USE_RUBY, moving from |
| 13 |
right to left, and pass it to emake. |
| 14 |
|
| 15 |
Package-Manager: Portage-3.0.17, Repoman-3.0.2 |
| 16 |
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com> |
| 17 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 18 |
|
| 19 |
dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild | 13 +++++++++++++ |
| 20 |
1 file changed, 13 insertions(+) |
| 21 |
|
| 22 |
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild |
| 23 |
index 94aa219cb56..2fe7e214b16 100644 |
| 24 |
--- a/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild |
| 25 |
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild |
| 26 |
@@ -36,6 +36,19 @@ multilib_src_configure() { |
| 27 |
ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers |
| 28 |
} |
| 29 |
|
| 30 |
+multilib_src_compile() { |
| 31 |
+ local candidates=(${USE_RUBY}) |
| 32 |
+ local ruby= |
| 33 |
+ for (( idx=${#candidates[@]}-1 ; idx>=0 ; idx-- )) ; do |
| 34 |
+ if ${candidates[idx]} --version &> /dev/null; then |
| 35 |
+ ruby=${candidates[idx]} && break |
| 36 |
+ fi |
| 37 |
+ done |
| 38 |
+ [[ -z ${ruby} ]] && die "No ruby executable found" |
| 39 |
+ |
| 40 |
+ emake RUBY=${ruby} |
| 41 |
+} |
| 42 |
+ |
| 43 |
multilib_src_install() { |
| 44 |
default |
Archives