From 3cd1ed516a9fbe8f950c726fe1920e1018489ed9 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 27 May 2020 17:51:24 +0000 Subject: [PATCH] devel/intel-graphics-compiler: update to 1.0.4053 Changes: https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.4053 Reported by: GitHub (watch releases) --- devel/intel-graphics-compiler/Makefile | 2 +- devel/intel-graphics-compiler/distinfo | 6 ++--- .../intel-graphics-compiler/files/patch-llvm | 24 +++++++++++++++++++ .../files/patch-no-hardcode | 13 ---------- .../intel-graphics-compiler/files/patch-unix | 11 +-------- lang/intel-compute-runtime/Makefile | 1 + 6 files changed, 30 insertions(+), 27 deletions(-) create mode 100644 devel/intel-graphics-compiler/files/patch-llvm delete mode 100644 devel/intel-graphics-compiler/files/patch-no-hardcode diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile index b9f9a6ae8890..e771a6edb007 100644 --- a/devel/intel-graphics-compiler/Makefile +++ b/devel/intel-graphics-compiler/Makefile @@ -2,7 +2,7 @@ PORTNAME= intel-graphics-compiler DISTVERSIONPREFIX= igc- -DISTVERSION= 1.0.3977 +DISTVERSION= 1.0.4053 CATEGORIES= devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo index 1dd2a1c5ae1b..dc7320885e49 100644 --- a/devel/intel-graphics-compiler/distinfo +++ b/devel/intel-graphics-compiler/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1588933907 -SHA256 (intel-intel-graphics-compiler-igc-1.0.3977_GH0.tar.gz) = 60641b21c01f97f4b2a1881f7562449c733fdde9108b7e4ad5be2b4db38ceae6 -SIZE (intel-intel-graphics-compiler-igc-1.0.3977_GH0.tar.gz) = 6042209 +TIMESTAMP = 1589867044 +SHA256 (intel-intel-graphics-compiler-igc-1.0.4053_GH0.tar.gz) = 9117399688b02f7cee51fccbd0f140921377c8250563f65ae92a1e9ed1abd717 +SIZE (intel-intel-graphics-compiler-igc-1.0.4053_GH0.tar.gz) = 5818791 SHA256 (b4e40a433077.patch) = 56950deb485a4c1dc844f4864f42b80907919b61132b0e797f7955989fed0597 SIZE (b4e40a433077.patch) = 9585 diff --git a/devel/intel-graphics-compiler/files/patch-llvm b/devel/intel-graphics-compiler/files/patch-llvm new file mode 100644 index 000000000000..50e2d2447e57 --- /dev/null +++ b/devel/intel-graphics-compiler/files/patch-llvm @@ -0,0 +1,24 @@ +Don't look for libLLVM without llvm-config or LLVM.cmake help + +-- [IGC] LLVM targets are not defined. Searching for LLVM. +-- [IGC] Using system LLVM 10.0.0 +CMake Error at IGC/CMakeLists.txt:3283 (message): + [IGC] Could not find the LLVM dylib. Aborting. + +--- IGC/CMakeLists.txt.orig 2020-05-19 05:44:04 UTC ++++ IGC/CMakeLists.txt +@@ -3278,12 +3278,8 @@ if(LLVM_LINK_LLVM_DYLIB) + set(IGC_BUILD__LLVM_LIBS_TO_LINK "${SET_LLVM_LIB_PATH}/libLLVM-${LLVM_VERSION_MAJOR}.so") + message(STATUS "[IGC] Link against specified LLVM dylib ${IGC_BUILD__LLVM_LIBS_TO_LINK}") + else() +- find_library(IGC_BUILD__LLVM_LIBS_TO_LINK "libLLVM-${LLVM_VERSION_MAJOR}.so") +- if(IGC_BUILD__LLVM_LIBS_TO_LINK) +- message(STATUS "[IGC] Link against found LLVM dylib ${IGC_BUILD__LLVM_LIBS_TO_LINK}") +- else() +- message(FATAL_ERROR "[IGC] Could not find the LLVM dylib. Aborting.") +- endif() ++ set(IGC_BUILD__LLVM_LIBS_TO_LINK "LLVM") ++ message(STATUS "[IGC] Link against LLVM dylib") + endif() + + else() diff --git a/devel/intel-graphics-compiler/files/patch-no-hardcode b/devel/intel-graphics-compiler/files/patch-no-hardcode deleted file mode 100644 index 33a5bb4abbe0..000000000000 --- a/devel/intel-graphics-compiler/files/patch-no-hardcode +++ /dev/null @@ -1,13 +0,0 @@ -ninja: error: '/usr/local/lib/libLLVM-10.so', needed by 'IGC/Release/elf_packager', missing and no known rule to make it - ---- IGC/CMakeLists.txt.orig 2020-04-22 09:56:42 UTC -+++ IGC/CMakeLists.txt -@@ -3275,7 +3275,7 @@ endif() - if(LLVM_LINK_LLVM_DYLIB) - # LLVM was built and configured in a way that tools (in our case IGC) should be linked - # against single LLVM dynamic library. -- set(IGC_BUILD__LLVM_LIBS_TO_LINK "/usr/local/lib/libLLVM-${LLVM_VERSION_MAJOR}.so") -+ set(IGC_BUILD__LLVM_LIBS_TO_LINK "LLVM") - message(STATUS "[IGC] Link against LLVM dylib ${IGC_BUILD__LLVM_LIBS_TO_LINK}") - else() - # LLVM was built into multiple libraries (static or shared). diff --git a/devel/intel-graphics-compiler/files/patch-unix b/devel/intel-graphics-compiler/files/patch-unix index 809184411883..7d886926783c 100644 --- a/devel/intel-graphics-compiler/files/patch-unix +++ b/devel/intel-graphics-compiler/files/patch-unix @@ -137,7 +137,7 @@ CMake Error at IGC/CMakeLists.txt:1974 (message): if (!IGC_IS_FLAG_ENABLED(DumpToCurrentDir) && g_shaderOutputFolder == "" && !IGC_IS_FLAG_ENABLED(DumpToCustomDir)) { bool needMkdir = false; ---- IGC/AdaptorOCL/CLElfLib/CLElfTypes.h.orig 2019-11-27 01:05:20 UTC +--- IGC/AdaptorOCL/CLElfLib/CLElfTypes.h.orig 2020-05-19 05:44:04 UTC +++ IGC/AdaptorOCL/CLElfLib/CLElfTypes.h @@ -30,7 +30,7 @@ Abstract: Defines the types used for ELF headers/sect \******************************************************************************/ @@ -148,15 +148,6 @@ CMake Error at IGC/CMakeLists.txt:1974 (message): #include "os_inc.h" #endif -@@ -38,7 +38,7 @@ Abstract: Defines the types used for ELF headers/sect - #include - #endif - --#if defined(__linux__) -+#if !defined(__APPLE__) && !defined(_WIN32) - #include "elf.h" - #endif - --- IGC/AdaptorOCL/DriverInfoOCL.hpp.orig 2020-02-22 05:52:18 UTC +++ IGC/AdaptorOCL/DriverInfoOCL.hpp @@ -71,7 +71,7 @@ namespace TC diff --git a/lang/intel-compute-runtime/Makefile b/lang/intel-compute-runtime/Makefile index 15b9aa36c6f3..0ff1f234d50f 100644 --- a/lang/intel-compute-runtime/Makefile +++ b/lang/intel-compute-runtime/Makefile @@ -2,6 +2,7 @@ PORTNAME= compute-runtime DISTVERSION= 20.20.16837 +PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= intel-