JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

amdapp-sdk: fix build for gcc 5

Browse Source 
(cherry picked from commit 1dcd93c1def1b26b0b4736a33fb8246b53602e73)
Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
Reno Reckling 2016-09-20 14:50:22 +03:00 committed by Domen Kožar
parent 97801380b0
commit 3cb6f522db
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/misc/amdapp-sdk/default.nix
View File

@ -22,6 +22,7 @@ let
url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.7-lnx${bits}.tgz"; url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.7-lnx${bits}.tgz";
x86 = "1v26n7g1xvlg5ralbfk3qiy34gj8fascpnjzm3120b6sgykfp16b"; x86 = "1v26n7g1xvlg5ralbfk3qiy34gj8fascpnjzm3120b6sgykfp16b";
x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1"; x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1";
patches = [ ./gcc-5.patch];
}; };
"2.8" = { "2.8" = {
@ -30,7 +31,7 @@ let
x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681"; x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681";
# TODO: Add support for aparapi, java parallel api # TODO: Add support for aparapi, java parallel api
patches = [ ./01-remove-aparapi-samples.patch ]; patches = [ ./01-remove-aparapi-samples.patch ./gcc-5.patch];
}; };
}; };

11
pkgs/development/misc/amdapp-sdk/gcc-5.patch Normal file
View File

@ -0,0 +1,11 @@
--- include/CL/cl.hpp
+++ include/CL/cl.hpp
@@ -201,7 +201,7 @@
#include <functional>
#define __CL_FUNCTION_TYPE typename std::function
#define CL_USE_CPP_FUNCTORS
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX)
+#elif (((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 5)) && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX)
#include <tr1/functional>
#define __CL_FUNCTION_TYPE typename std::tr1::function
#define CL_USE_CPP_FUNCTORS