diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile index b32c380c8abb..7ea82934a77e 100644 --- a/devel/intel-graphics-compiler/Makefile +++ b/devel/intel-graphics-compiler/Makefile @@ -1,52 +1,52 @@ PORTNAME= intel-graphics-compiler DISTVERSIONPREFIX= igc- -DISTVERSION= 1.0.9289 +DISTVERSION= 1.0.9389 CATEGORIES= devel PKGNAMESUFFIX= -${FLAVOR} PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 99edbf49d7c9.patch:-p1 # clang MAINTAINER= jbeich@FreeBSD.org COMMENT= Intel Graphics Compiler for OpenCL LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= only Intel GPUs on x86 are supported BUILD_DEPENDS= vc-intrinsics-${FLAVOR}>=s20210730:devel/vc-intrinsics@${FLAVOR} LIB_DEPENDS= libLLVM-${FLAVOR:S/llvm//}.so:devel/${FLAVOR} \ libopencl-clang.so.${FLAVOR:S/llvm//}:devel/opencl-clang@${FLAVOR} FLAVORS= ${12 11:L:S/^/llvm/} CONFLICTS_INSTALL= ${PORTNAME}-* USES= bison cmake compiler:c++17-lang python:build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-123-g814e728:headers/../SPIRV-Headers \ KhronosGroup:SPIRV-Tools:v2021.4:tools/../SPIRV-Tools CMAKE_OFF= INSTALL_SPIRVDLL CMAKE_ARGS= -DCMAKE_PREFIX_PATH:PATH="${LOCALBASE}/${FLAVOR}" \ -DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${FLAVOR:S/llvm//}" CFLAGS+= -Wno-macro-redefined # __fastcall PLIST_SUB= ARCH_SUFX=${ARCH:S/i386/32/:S/amd//:S/x86_//} post-patch: # lang/python* don't install unsuffixed symlinks @${REINPLACE_CMD} -i .python \ -e '/EXECUTABLE/s/"python"/"${PYTHON_CMD:T}"/' \ -e '/IGC_PYTHON/s/"python"/"${PYTHON_CMD:T}"/' \ ${WRKSRC}/IGC/CMakeLists.txt \ ${WRKSRC}/IGC/BiFModule/linux/CMakeLists.txt # No need to abort on every benign warning enabled by default # Disable debug symbols unless WITH_DEBUG passed via CXXFLAGS @${REINPLACE_CMD} -e 's/"-Werror"//; /-Werror/d' \ -e 's/"-g"//' \ ${WRKSRC}/IGC/CMakeLists.txt .include diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo index 40433876fc3e..80773a109b84 100644 --- a/devel/intel-graphics-compiler/distinfo +++ b/devel/intel-graphics-compiler/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1635500623 -SHA256 (intel-intel-graphics-compiler-igc-1.0.9289_GH0.tar.gz) = 78fac5e59a0f50253a679d5ed1d66c19c970014ead3510b8b4cfab973015a110 -SIZE (intel-intel-graphics-compiler-igc-1.0.9289_GH0.tar.gz) = 7872553 +TIMESTAMP = 1636364708 +SHA256 (intel-intel-graphics-compiler-igc-1.0.9389_GH0.tar.gz) = 563a525375c25875aeb41a0fed1ebe9d1c3d67355576c73948c5305bcac93e36 +SIZE (intel-intel-graphics-compiler-igc-1.0.9389_GH0.tar.gz) = 7883556 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = e4880dccda018f63cdc684afd5e51972d8ad2e3f21e9bab346a865370ea2929e SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = 416402 SHA256 (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = d68de260708dda785d109ff1ceeecde2d2ab71142fa5bf59061bb9f47dd3bb2c SIZE (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = 2887505 SHA256 (99edbf49d7c9.patch) = c7a96b5629384422ff2d848624ac60d5cc6dffd0289bce430df1ba813a45474c SIZE (99edbf49d7c9.patch) = 1151 diff --git a/devel/intel-graphics-compiler/files/patch-strerror_r b/devel/intel-graphics-compiler/files/patch-strerror_r deleted file mode 100644 index d5996876448f..000000000000 --- a/devel/intel-graphics-compiler/files/patch-strerror_r +++ /dev/null @@ -1,23 +0,0 @@ -POSIX version of strerror_r returns int - -visa/iga/IGALibrary/system.cpp:263:14: error: assigning to 'char *' from incompatible type 'int' - errMsg = strerror_r(errCode, buf, sizeof(buf)); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ---- visa/iga/IGALibrary/system.cpp.orig 2021-09-11 19:03:27 UTC -+++ visa/iga/IGALibrary/system.cpp -@@ -259,8 +259,13 @@ std::string iga::FormatLastError(unsigned errCode) - NULL); - if (errMsg) - msg = errMsg; --#else -+#elif defined(__GLIBC__) - errMsg = strerror_r(errCode, buf, sizeof(buf)); -+#else -+ if (strerror_r(errCode, buf, sizeof(buf))) -+ errMsg = nullptr; -+ else -+ errMsg = buf; - #endif // _WIN32 - if (errMsg == nullptr || errMsg[0] == 0) - return "???";