| 1 |
commit: 329d9112649233d7fa6b61efc8af7c7ac023703f |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 2 08:48:54 2016 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 2 08:49:23 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329d9112 |
| 7 |
|
| 8 |
dev-libs/beignet: a few additional build-time tweaks |
| 9 |
|
| 10 |
! add the die clause to ICD-file generation using echo |
| 11 |
* use tc-is-gcc instead of parsing tc-getCC ourselves |
| 12 |
* explicitly inherit toolchain-funcs |
| 13 |
* no real need to rename the source tarball |
| 14 |
|
| 15 |
Package-Manager: portage-2.3.0 |
| 16 |
|
| 17 |
dev-libs/beignet/Manifest | 2 +- |
| 18 |
dev-libs/beignet/beignet-1.1.2.ebuild | 8 ++++---- |
| 19 |
2 files changed, 5 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest |
| 22 |
index b8b6ac7..4590316 100644 |
| 23 |
--- a/dev-libs/beignet/Manifest |
| 24 |
+++ b/dev-libs/beignet/Manifest |
| 25 |
@@ -1 +1 @@ |
| 26 |
-DIST beignet-1.1.2.tar.gz 948241 SHA256 6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96 SHA512 25b7118976c385ad3b9db01afd3c9494ff9d050d44ee4266042abb4215747d8bb5086c06697f754956f562ea2b6e5ec51d51bbd651e8cd7cd0eb14eb8c83fbd4 WHIRLPOOL c3bfb7f4fa3c97bbd202ace868a08dce48753cac547b075e4c30cfff21cffcc5520ef4ef77b4e15fa8574a798f41a920e44503a160a1888e9ee4f2a737b37e82 |
| 27 |
+DIST beignet-1.1.2-source.tar.gz 948241 SHA256 6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96 SHA512 25b7118976c385ad3b9db01afd3c9494ff9d050d44ee4266042abb4215747d8bb5086c06697f754956f562ea2b6e5ec51d51bbd651e8cd7cd0eb14eb8c83fbd4 WHIRLPOOL c3bfb7f4fa3c97bbd202ace868a08dce48753cac547b075e4c30cfff21cffcc5520ef4ef77b4e15fa8574a798f41a920e44503a160a1888e9ee4f2a737b37e82 |
| 28 |
|
| 29 |
diff --git a/dev-libs/beignet/beignet-1.1.2.ebuild b/dev-libs/beignet/beignet-1.1.2.ebuild |
| 30 |
index 2591bc8..8d42db8 100644 |
| 31 |
--- a/dev-libs/beignet/beignet-1.1.2.ebuild |
| 32 |
+++ b/dev-libs/beignet/beignet-1.1.2.ebuild |
| 33 |
@@ -7,7 +7,7 @@ EAPI=6 |
| 34 |
PYTHON_COMPAT=( python2_7 ) |
| 35 |
CMAKE_BUILD_TYPE="Release" |
| 36 |
|
| 37 |
-inherit python-any-r1 cmake-multilib |
| 38 |
+inherit python-any-r1 cmake-multilib toolchain-funcs |
| 39 |
|
| 40 |
DESCRIPTION="OpenCL implementation for Intel GPUs" |
| 41 |
HOMEPAGE="https://01.org/beignet" |
| 42 |
@@ -21,7 +21,7 @@ if [[ "${PV}" == "9999" ]]; then |
| 43 |
KEYWORDS="" |
| 44 |
else |
| 45 |
KEYWORDS="~amd64" |
| 46 |
- SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz -> ${P}.tar.gz" |
| 47 |
+ SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz" |
| 48 |
S=${WORKDIR}/Beignet-${PV}-Source |
| 49 |
fi |
| 50 |
|
| 51 |
@@ -50,7 +50,7 @@ DOCS=( |
| 52 |
|
| 53 |
pkg_pretend() { |
| 54 |
if [[ ${MERGE_TYPE} != "binary" ]]; then |
| 55 |
- if [[ $(tc-getCC) == *gcc* ]] ; then |
| 56 |
+ if tc-is-gcc; then |
| 57 |
if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then |
| 58 |
eerror "Compilation with gcc older than 4.6 is not supported" |
| 59 |
die "Too old gcc found." |
| 60 |
@@ -86,7 +86,7 @@ multilib_src_install() { |
| 61 |
cmake-utils_src_install |
| 62 |
|
| 63 |
insinto /etc/OpenCL/vendors/ |
| 64 |
- echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" |
| 65 |
+ echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file" |
| 66 |
doins "${PN}-${ABI}.icd" |
| 67 |
|
| 68 |
dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1 |
Archives