diff options
| author |   Matteo Bernardini | 2018-03-20 07:59:35 +0100 |
|---|---|---|
| committer | Matteo Bernardini | 2018-06-09 07:47:02 +0200 |
| commit | 483b57f6e31123f80c724dc86e76138883b52bd4 (patch) | |
| tree | 55454981879bec92074c99f19af3a5f357035cc5 | |
| parent | 81c344443219574587ae3d6bccb8f19c1bd346af (diff) | |
| download | old.slackbuilds-beignet.tar.gz | |
libraries/beignet: Updated for version 1.3.2, fix for llvm >= 6.x.beignet
Thanks to USUARIONUEVO
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | libraries/beignet/beignet.SlackBuild | 4 | ||||
| -rw-r--r-- | libraries/beignet/beignet.info | 6 | ||||
| -rw-r--r-- | libraries/beignet/llvm6.patch | 30 |
3 files changed, 36 insertions, 4 deletions
diff --git a/libraries/beignet/beignet.SlackBuild b/libraries/beignet/beignet.SlackBuild index ce61606dea..1d7a06dcdd 100644 --- a/libraries/beignet/beignet.SlackBuild +++ b/libraries/beignet/beignet.SlackBuild @@ -24,7 +24,7 @@ # ----------------------------------------------------------------------------- PRGNAM=beignet -VERSION=${VERSION:-1.3.1} +VERSION=${VERSION:-1.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} DOCS="README.md docs NEWS.mdwn COPYING" @@ -75,6 +75,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/llvm6.patch + mkdir -p build cd build cmake \ diff --git a/libraries/beignet/beignet.info b/libraries/beignet/beignet.info index dae99c57d9..fff7aa7b6d 100644 --- a/libraries/beignet/beignet.info +++ b/libraries/beignet/beignet.info @@ -1,8 +1,8 @@ PRGNAM="beignet" -VERSION="1.3.1" +VERSION="1.3.2" HOMEPAGE="https://01.org/beignet" -DOWNLOAD="https://01.org/sites/default/files/beignet-1.3.1-source.tar.gz" -MD5SUM="850886a71a34672ca26a42046d0bb442" +DOWNLOAD="https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz" +MD5SUM="a577ab18d67a891c8767b8ea62253543" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/beignet/llvm6.patch b/libraries/beignet/llvm6.patch new file mode 100644 index 0000000000..f3634e2389 --- /dev/null +++ b/libraries/beignet/llvm6.patch @@ -0,0 +1,30 @@ +diff -uprb Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_to_gen.cpp Beignet-1.3.2-Source/backend/src/llvm/llvm_to_gen.cpp +--- Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_to_gen.cpp 2017-10-24 09:04:48.000000000 +0300 ++++ Beignet-1.3.2-Source/backend/src/llvm/llvm_to_gen.cpp 2018-03-16 16:08:54.669963824 +0200 +@@ -322,7 +322,11 @@ namespace gbe + DataLayout DL(&mod); + + gbeDiagnosticContext dc; ++#if LLVM_VERSION_MAJOR >= 6 ++ mod.getContext().setDiagnosticHandlerCallBack(&gbeDiagnosticHandler,&dc); ++#else + mod.getContext().setDiagnosticHandler(&gbeDiagnosticHandler,&dc); ++#endif + + #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 37 + mod.setDataLayout(DL); +diff -uprb Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_unroll.cpp Beignet-1.3.2-Source/backend/src/llvm/llvm_unroll.cpp +--- Beignet-1.3.2-Source.orig/backend/src/llvm/llvm_unroll.cpp 2017-10-24 09:04:48.000000000 +0300 ++++ Beignet-1.3.2-Source/backend/src/llvm/llvm_unroll.cpp 2018-03-16 16:09:47.736403557 +0200 +@@ -205,7 +205,9 @@ namespace gbe { + if (parentTripCount != 0 && currTripCount * parentTripCount > 32) { + //Don't change the unrollID if doesn't force unroll. + //setUnrollID(parentL, false); +-#if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38 ++#if LLVM_VERSION_MAJOR >= 6 ++ loopInfo.erase(parentL); ++#elif LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 38 + loopInfo.markAsRemoved(parentL); + #else + LPM.deleteLoopFromQueue(parentL); +Only in Beignet-1.3.2-Source: build |