commit: 329d9112649233d7fa6b61efc8af7c7ac023703f Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Fri Sep 2 08:48:54 2016 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Fri Sep 2 08:49:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329d9112
dev-libs/beignet: a few additional build-time tweaks ! add the die clause to ICD-file generation using echo * use tc-is-gcc instead of parsing tc-getCC ourselves * explicitly inherit toolchain-funcs * no real need to rename the source tarball Package-Manager: portage-2.3.0 dev-libs/beignet/Manifest | 2 +- dev-libs/beignet/beignet-1.1.2.ebuild | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest index b8b6ac7..4590316 100644 --- a/dev-libs/beignet/Manifest +++ b/dev-libs/beignet/Manifest @@ -1 +1 @@ -DIST beignet-1.1.2.tar.gz 948241 SHA256 6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96 SHA512 25b7118976c385ad3b9db01afd3c9494ff9d050d44ee4266042abb4215747d8bb5086c06697f754956f562ea2b6e5ec51d51bbd651e8cd7cd0eb14eb8c83fbd4 WHIRLPOOL c3bfb7f4fa3c97bbd202ace868a08dce48753cac547b075e4c30cfff21cffcc5520ef4ef77b4e15fa8574a798f41a920e44503a160a1888e9ee4f2a737b37e82 +DIST beignet-1.1.2-source.tar.gz 948241 SHA256 6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96 SHA512 25b7118976c385ad3b9db01afd3c9494ff9d050d44ee4266042abb4215747d8bb5086c06697f754956f562ea2b6e5ec51d51bbd651e8cd7cd0eb14eb8c83fbd4 WHIRLPOOL c3bfb7f4fa3c97bbd202ace868a08dce48753cac547b075e4c30cfff21cffcc5520ef4ef77b4e15fa8574a798f41a920e44503a160a1888e9ee4f2a737b37e82 diff --git a/dev-libs/beignet/beignet-1.1.2.ebuild b/dev-libs/beignet/beignet-1.1.2.ebuild index 2591bc8..8d42db8 100644 --- a/dev-libs/beignet/beignet-1.1.2.ebuild +++ b/dev-libs/beignet/beignet-1.1.2.ebuild @@ -7,7 +7,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) CMAKE_BUILD_TYPE="Release" -inherit python-any-r1 cmake-multilib +inherit python-any-r1 cmake-multilib toolchain-funcs DESCRIPTION="OpenCL implementation for Intel GPUs" HOMEPAGE="https://01.org/beignet"; @@ -21,7 +21,7 @@ if [[ "${PV}" == "9999" ]]; then KEYWORDS="" else KEYWORDS="~amd64" - SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz -> ${P}.tar.gz" + SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"; S=${WORKDIR}/Beignet-${PV}-Source fi @@ -50,7 +50,7 @@ DOCS=( pkg_pretend() { if [[ ${MERGE_TYPE} != "binary" ]]; then - if [[ $(tc-getCC) == *gcc* ]] ; then + if tc-is-gcc; then if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then eerror "Compilation with gcc older than 4.6 is not supported" die "Too old gcc found." @@ -86,7 +86,7 @@ multilib_src_install() { cmake-utils_src_install insinto /etc/OpenCL/vendors/ - echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" + echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file" doins "${PN}-${ABI}.icd" dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
