svn commit: r545798 - head/devel/intel-graphics-compiler

[Jan Beich]

Author: jbeich
Date: Sun Aug 23 00:00:28 2020
New Revision: 545798
URL: https://svnweb.freebsd.org/changeset/ports/545798

Log:
  devel/intel-graphics-compiler: unbreak on -CURRENT
  
  In file included from IGC/GenISAIntrinsics/GenIntrinsics.cpp:28:
  In file included from IGC/Compiler/CodeGenPublic.h:44:
  In file included from IGC/Compiler/CISACodeGen/helper.h:49:
  In file included from IGC/Compiler/MetaDataApi/MetaDataApi.h:31:
  In file included from IGC/Compiler/MetaDataApi/MetaDataApiUtils.h:30:
  IGC/Compiler/MetaDataApi/MetaDataValue.h:82:20: error: cannot initialize return object of type 'llvm::MDNode *' with an lvalue of type 'llvm::Metadata *'
              return m_pNode;
                     ^~~~~~~
  IGC/Compiler/MetaDataApi/MetaDataValue.h:260:23: error: incompatible pointer types assigning to 'llvm::Metadata *' from 'llvm::Value *'
              m_pNode = pNode;
                        ^~~~~
  IGC/Compiler/MetaDataApi/MetaDataValue.h:270:18: error: no viable overloaded '='
              m_id = name;
              ~~~~ ^ ~~~~
  IGC/Compiler/MetaDataApi/MetaDataValue.h:41:11: note: candidate function (the implicit copy assignment operator) not viable: no known conversion from 'const char *' to 'const IGC::MetaDataValue<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>, IGC::MDValueTraits<std::string, void>>' for 1st argument
      class MetaDataValue
            ^
  IGC/Compiler/MetaDataApi/MetaDataValue.h:41:11: note: candidate function (the implicit move assignment operator) not viable: no known conversion from 'const char *' to 'IGC::MetaDataValue<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>, IGC::MDValueTraits<std::string, void>>' for 1st argument
      class MetaDataValue
            ^
  IGC/Compiler/MetaDataApi/MetaDataValue.h:278:18: error: no viable overloaded '='
              m_id = name.c_str();
              ~~~~ ^ ~~~~~~~~~~~~
  IGC/Compiler/MetaDataApi/MetaDataValue.h:41:11: note: candidate function (the implicit copy assignment operator) not viable: no known conversion from 'const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::value_type *' (aka 'const char *') to 'const IGC::MetaDataValue<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>, IGC::MDValueTraits<std::string, void>>' for 1st argument
      class MetaDataValue
            ^
  IGC/Compiler/MetaDataApi/MetaDataValue.h:41:11: note: candidate function (the implicit move assignment operator) not viable: no known conversion from 'const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::value_type *' (aka 'const char *') to 'IGC::MetaDataValue<std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>, IGC::MDValueTraits<std::string, void>>' for 1st argument
      class MetaDataValue
            ^
  
  Reported by:	pkg-fallout

Modified:
  head/devel/intel-graphics-compiler/Makefile   (contents, props changed)

Modified: head/devel/intel-graphics-compiler/Makefile
==============================================================================
--- head/devel/intel-graphics-compiler/Makefile	Sat Aug 22 23:55:38 2020	(r545797)
+++ head/devel/intel-graphics-compiler/Makefile	Sun Aug 23 00:00:28 2020	(r545798)
@@ -26,7 +26,7 @@ GH_ACCOUNT=	intel
 CFLAGS+=	-Wno-macro-redefined # __fastcall
 PLIST_SUB=	ARCH_SUFX=${ARCH:S/i386/32/:S/amd//:S/x86_//}
 
-.if (exists(/usr/lib/clang/10.0.0) || exists(/usr/lib/clang/10.0.1)) && ${CXX} == c++
+.if (exists(/usr/lib/clang/10.0.0) || exists(/usr/lib/clang/10.0.1) || exists(/usr/lib/clang/11.0.0)) && ${CXX} == c++
 # https://github.com/intel/intel-graphics-compiler/issues/126
 BUILD_DEPENDS+=	clang++90:devel/llvm90
 USES:=		${USES:Ncompiler*}