Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
Date: Mon, 12 Aug 2019 12:09:09
Message-Id: 1565611611.f91f8bd0fee4fc9353a9ad3b7ef225de02efac9d.amadio@gentoo
1 commit: f91f8bd0fee4fc9353a9ad3b7ef225de02efac9d
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 12 12:05:39 2019 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 12 12:06:51 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f91f8bd0
7
8 dev-libs/ocl-icd: fix ${D} vs ${ED} for prefix
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
12
13 dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild | 4 ++--
14 dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild | 6 +++---
15 2 files changed, 5 insertions(+), 5 deletions(-)
16
17 diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
18 index 7bc7cd5195e..c9d2704ee26 100644
19 --- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
20 +++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
21 @@ -33,13 +33,13 @@ multilib_src_install() {
22 default
23
24 # Drop .la files
25 - find "${D}" -name '*.la' -delete || die
26 + find "${ED}" -name '*.la' -delete || die
27
28 OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
29 dodir ${OCL_DIR}/{,include}
30
31 # Install vendor library
32 - mv -f "${D}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
33 + mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
34
35 # Install vendor headers
36 if use khronos-headers; then
37
38 diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
39 index 38bc636d446..04777289f85 100644
40 --- a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
41 +++ b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
42 @@ -1,4 +1,4 @@
43 -# Copyright 1999-2018 Gentoo Authors
44 +# Copyright 1999-2019 Gentoo Authors
45 # Distributed under the terms of the GNU General Public License v2
46
47 EAPI=7
48 @@ -33,13 +33,13 @@ multilib_src_install() {
49 default
50
51 # Drop .la files
52 - find "${D}" -name '*.la' -delete || die
53 + find "${ED}" -name '*.la' -delete || die
54
55 OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
56 dodir ${OCL_DIR}/{,include}
57
58 # Install vendor library
59 - mv -f "${D}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
60 + mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
61
62 # Install vendor headers
63 if use khronos-headers; then