lang/compute-runtime: switch to upstream fix for Clang 9

3 files changed, 6 insertions, 76 deletions

diff --git a/lang/compute-runtime/Makefile b/lang/compute-runtime/Makefile
index c0645c9e4872..b7701f099b54 100644
--- a/lang/compute-runtime/Makefile
+++ b/lang/compute-runtime/Makefile
@@ -2,8 +2,12 @@
 
 PORTNAME=	compute-runtime
 DISTVERSION=	19.48.14977
+PORTREVISION=	1
 CATEGORIES=	lang
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	fb8df1a328e4.patch:-p1
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	OpenCL library for Intel HD 5000 (Gen8) or newer
 
diff --git a/lang/compute-runtime/distinfo b/lang/compute-runtime/distinfo
index 1f5d73e70fd0..c7d8cfca29d9 100644
--- a/lang/compute-runtime/distinfo
+++ b/lang/compute-runtime/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1575037414
 SHA256 (intel-compute-runtime-19.48.14977_GH0.tar.gz) = 1b3c58260582f1af8934cd23837c9b27326f3968b8a21755dbf7d3feec7ebcd3
 SIZE (intel-compute-runtime-19.48.14977_GH0.tar.gz) = 2633172
+SHA256 (fb8df1a328e4.patch) = 6fd8308328b85af5a17bc80466ecfc35c0f95c00dfa74b2bd2ba24af19f19ed4
+SIZE (fb8df1a328e4.patch) = 5903
diff --git a/lang/compute-runtime/files/patch-clang9 b/lang/compute-runtime/files/patch-clang9
deleted file mode 100644
index c91edd8c5776..000000000000
--- a/lang/compute-runtime/files/patch-clang9
+++ /dev/null
@@ -1,76 +0,0 @@
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen9.cpp
->>>            preamble_gen9.cpp.o:(.rodata+0x0) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen9.cpp
->>>            preamble_gen9.cpp.o:(.rodata+0x4) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at command_stream_receiver_hw_gen11.cpp
->>>            command_stream_receiver_hw_gen11.cpp.o:(.rodata+0x0) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at command_stream_receiver_hw_gen11.cpp
->>>            command_stream_receiver_hw_gen11.cpp.o:(.rodata+0x4) in archive ../lib/libigdrcl_lib_release.a
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen11.cpp
->>>            preamble_gen11.cpp.o:(.rodata+0x0) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen11.cpp
->>>            preamble_gen11.cpp.o:(.rodata+0x4) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at aub_mem_dump_gen12lp.cpp
->>>            aub_mem_dump_gen12lp.cpp.o:(.rodata+0x0) in archive ../lib/libigdrcl_lib_release.a
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at aub_mem_dump_gen12lp.cpp
->>>            aub_mem_dump_gen12lp.cpp.o:(.rodata+0x4) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::registerOffset<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen12lp.cpp
->>>            preamble_gen12lp.cpp.o:(.rodata+0x0) in archive ../lib/libigdrcl_lib_release.a
-
-ld: error: duplicate symbol: NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>
->>> defined at preamble_gen8.cpp
->>>            preamble_gen8.cpp.o:(NEO::DebugModeRegisterOffset::debugEnabledValue<NEO::ICLFamily>) in archive ../lib/libigdrcl_lib_release.a
->>> defined at preamble_gen12lp.cpp
->>>            preamble_gen12lp.cpp.o:(.rodata+0x4) in archive ../lib/libigdrcl_lib_release.a
-
---- runtime/gen11/reg_configs.h.orig	2019-11-29 14:23:34 UTC
-+++ runtime/gen11/reg_configs.h
-@@ -25,9 +25,15 @@ struct L3CNTLRegisterOffset<ICLFamily> {
- 
- namespace DebugModeRegisterOffset {
- template <>
-+#ifdef __clang__
-+static
-+#endif
- constexpr uint32_t registerOffset<ICLFamily> = 0x20d8;
- template <>
-+#ifdef __clang__
-+static
-+#endif
- constexpr uint32_t debugEnabledValue<ICLFamily> = (1 << 5) | (1 << 21);
- }; // namespace DebugModeRegisterOffset
- 
- namespace gen11HdcModeRegister {