[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/, dev-libs/beignet/files/

[Marek Szuba]

commit:     0f242087271440a25e7404806e602393f664b2a5
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 13:07:38 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 13:08:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f242087

dev-libs/beignet: make the live ebuild compile again

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-libs/beignet/beignet-9999.ebuild                    |  2 +-
 .../beignet-1.4.0-oclicd_no_upstream_icdfile.patch      | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dev-libs/beignet/beignet-9999.ebuild 
b/dev-libs/beignet/beignet-9999.ebuild
index 89862c1fc51..d25a0abde8c 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-9999.ebuild
@@ -40,7 +40,7 @@ DEPEND="${COMMON}
 
 PATCHES=(
        "${FILESDIR}"/${PN}-1.4.0_no-debian-multiarch.patch
-       "${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
+       "${FILESDIR}"/${PN}-1.4.0-oclicd_no_upstream_icdfile.patch
        "${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
        "${FILESDIR}"/llvm-terminfo.patch
 )

diff --git 
a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch 
b/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch
new file mode 100644
index 00000000000..ddffcfc8aff
--- /dev/null
+++ b/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch
@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -214,14 +214,6 @@
+   Find_Package(OCLIcd)
+   IF(OCLIcd_FOUND)
+     MESSAGE(STATUS "Looking for OCL ICD header file - found")
+-    configure_file (
+-      "intel-beignet.icd.in"
+-      "${ICD_FILE_NAME}"
+-      )
+-    IF(NOT OCL_ICD_INSTALL_PREFIX)
+-      set(OCL_ICD_INSTALL_PREFIX "/etc/OpenCL/vendors")
+-    ENDIF(NOT OCL_ICD_INSTALL_PREFIX)
+-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION 
${OCL_ICD_INSTALL_PREFIX})
+   ELSE(OCLIcd_FOUND)
+     MESSAGE(STATUS "Looking for OCL ICD header file - not found")
+     MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable 
OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.")