| 1 |
commit: 0f242087271440a25e7404806e602393f664b2a5 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 17 13:07:38 2017 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 17 13:08:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f242087 |
| 7 |
|
| 8 |
dev-libs/beignet: make the live ebuild compile again |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-libs/beignet/beignet-9999.ebuild | 2 +- |
| 13 |
.../beignet-1.4.0-oclicd_no_upstream_icdfile.patch | 17 +++++++++++++++++ |
| 14 |
2 files changed, 18 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild |
| 17 |
index 89862c1fc51..d25a0abde8c 100644 |
| 18 |
--- a/dev-libs/beignet/beignet-9999.ebuild |
| 19 |
+++ b/dev-libs/beignet/beignet-9999.ebuild |
| 20 |
@@ -40,7 +40,7 @@ DEPEND="${COMMON} |
| 21 |
|
| 22 |
PATCHES=( |
| 23 |
"${FILESDIR}"/${PN}-1.4.0_no-debian-multiarch.patch |
| 24 |
- "${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch |
| 25 |
+ "${FILESDIR}"/${PN}-1.4.0-oclicd_no_upstream_icdfile.patch |
| 26 |
"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch |
| 27 |
"${FILESDIR}"/llvm-terminfo.patch |
| 28 |
) |
| 29 |
|
| 30 |
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 |
| 31 |
new file mode 100644 |
| 32 |
index 00000000000..ddffcfc8aff |
| 33 |
--- /dev/null |
| 34 |
+++ b/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch |
| 35 |
@@ -0,0 +1,17 @@ |
| 36 |
+--- a/CMakeLists.txt |
| 37 |
++++ b/CMakeLists.txt |
| 38 |
+@@ -214,14 +214,6 @@ |
| 39 |
+ Find_Package(OCLIcd) |
| 40 |
+ IF(OCLIcd_FOUND) |
| 41 |
+ MESSAGE(STATUS "Looking for OCL ICD header file - found") |
| 42 |
+- configure_file ( |
| 43 |
+- "intel-beignet.icd.in" |
| 44 |
+- "${ICD_FILE_NAME}" |
| 45 |
+- ) |
| 46 |
+- IF(NOT OCL_ICD_INSTALL_PREFIX) |
| 47 |
+- set(OCL_ICD_INSTALL_PREFIX "/etc/OpenCL/vendors") |
| 48 |
+- ENDIF(NOT OCL_ICD_INSTALL_PREFIX) |
| 49 |
+- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${OCL_ICD_INSTALL_PREFIX}) |
| 50 |
+ ELSE(OCLIcd_FOUND) |
| 51 |
+ MESSAGE(STATUS "Looking for OCL ICD header file - not found") |
| 52 |
+ MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.") |
Archives