Merge pull request #62993 from volth/beignet-2018
beignet: 1.3.2 -> unstable-2018.08.20
This commit is contained in:
commit
da6a07817e
|
@ -47,16 +47,3 @@ index a148321..96cafb8 100644
|
||||||
set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB})
|
set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB})
|
||||||
unset(CLANG_LIB CACHE)
|
unset(CLANG_LIB CACHE)
|
||||||
endmacro()
|
endmacro()
|
||||||
diff --git a/./CMakeLists.txt b/../Beignet-1.1.2-Source_new/CMakeLists.txt
|
|
||||||
index 88985d7..01bca9e 100644
|
|
||||||
--- a/./CMakeLists.txt
|
|
||||||
+++ b/../Beignet-1.1.2-Source_new/CMakeLists.txt
|
|
||||||
@@ -205,7 +205,7 @@ IF(OCLIcd_FOUND)
|
|
||||||
"intel-beignet.icd.in"
|
|
||||||
"${ICD_FILE_NAME}"
|
|
||||||
)
|
|
||||||
- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors)
|
|
||||||
+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors)
|
|
||||||
ELSE(OCLIcd_FOUND)
|
|
||||||
MESSAGE(STATUS "Looking for OCL ICD header file - not found")
|
|
||||||
ENDIF(OCLIcd_FOUND)
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv
|
{ stdenv
|
||||||
, fetchurl
|
, fetchFromGitHub
|
||||||
, cmake
|
, cmake
|
||||||
, pkgconfig
|
, pkgconfig
|
||||||
, clang-unwrapped
|
, clang-unwrapped
|
||||||
|
@ -19,11 +19,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "beignet-${version}";
|
name = "beignet-${version}";
|
||||||
version = "1.3.2";
|
version = "unstable-2018.08.20";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "https://01.org/sites/default/files/${name}-source.tar.gz";
|
owner = "intel";
|
||||||
sha256 = "0hqb04jhjjslnmi3fnpzphanz84zywwkyw2sjr1k5qlx2jxfsmf5";
|
repo = "beignet";
|
||||||
|
rev = "fc5f430cb7b7a8f694d86acbb038bd5b38ec389c";
|
||||||
|
sha256 = "1z64v69w7f52jrskh1jfyh1x46mzfhjrqxj9hhgzh3xxv9yla32h";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./clang_llvm.patch ];
|
patches = [ ./clang_llvm.patch ];
|
||||||
|
@ -31,6 +33,7 @@ stdenv.mkDerivation rec {
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt --replace /etc/OpenCL/vendors "\''${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors"
|
||||||
patchShebangs src/git_sha1.sh
|
patchShebangs src/git_sha1.sh
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -101,8 +104,8 @@ stdenv.mkDerivation rec {
|
||||||
homepage = https://cgit.freedesktop.org/beignet/;
|
homepage = https://cgit.freedesktop.org/beignet/;
|
||||||
description = "OpenCL Library for Intel Ivy Bridge and newer GPUs";
|
description = "OpenCL Library for Intel Ivy Bridge and newer GPUs";
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
The package provides an open source implementation of the OpenCL specification for Intel GPUs.
|
The package provides an open source implementation of the OpenCL specification for Intel GPUs.
|
||||||
It supports the Intel OpenCL runtime library and compiler.
|
It supports the Intel OpenCL runtime library and compiler.
|
||||||
'';
|
'';
|
||||||
license = licenses.lgpl21Plus;
|
license = licenses.lgpl21Plus;
|
||||||
maintainers = with maintainers; [ artuuge zimbatm ];
|
maintainers = with maintainers; [ artuuge zimbatm ];
|
||||||
|
|
|
@ -9935,7 +9935,7 @@ in
|
||||||
belr = callPackage ../development/libraries/belr { };
|
belr = callPackage ../development/libraries/belr { };
|
||||||
|
|
||||||
beignet = callPackage ../development/libraries/beignet {
|
beignet = callPackage ../development/libraries/beignet {
|
||||||
inherit (llvmPackages_39) llvm clang-unwrapped;
|
inherit (llvmPackages_6) llvm clang-unwrapped;
|
||||||
};
|
};
|
||||||
|
|
||||||
belle-sip = callPackage ../development/libraries/belle-sip { };
|
belle-sip = callPackage ../development/libraries/belle-sip { };
|
||||||
|
|
Loading…
Reference in a new issue