svn commit: r484601 - branches/2018Q4/emulators/rpcs3/files

Jan Beich jbeich at FreeBSD.org
Sat Nov 10 10:28:34 UTC 2018


Author: jbeich
Date: Sat Nov 10 10:28:33 2018
New Revision: 484601
URL: https://svnweb.freebsd.org/changeset/ports/484601

Log:
  MFH: r484600
  
  emulators/rpcs3: unbreak build with clang > 6.0.0
  
  Assertion failed: (D->getCachedLinkage() == LV.getLinkage()), function getLVForDecl, file /usr/src/contrib/llvm/tools/clang/lib/AST/Decl.cpp, line 1394.
  
  PR:		231952
  Reported by:	pkg-fallout
  Submitted by:	Roman CAT
  Approved by:	ports-secteam blanket

Added:
  branches/2018Q4/emulators/rpcs3/files/patch-Utilities_typemap.h
     - copied unchanged from r484600, head/emulators/rpcs3/files/patch-Utilities_typemap.h
Modified:
Directory Properties:
  branches/2018Q4/   (props changed)

Copied: branches/2018Q4/emulators/rpcs3/files/patch-Utilities_typemap.h (from r484600, head/emulators/rpcs3/files/patch-Utilities_typemap.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q4/emulators/rpcs3/files/patch-Utilities_typemap.h	Sat Nov 10 10:28:33 2018	(r484601, copy of r484600, head/emulators/rpcs3/files/patch-Utilities_typemap.h)
@@ -0,0 +1,16 @@
+Workaround for https://bugs.llvm.org/show_bug.cgi?id=39246
+
+--- Utilities/typemap.h.orig	2018-11-09 13:19:59 UTC
++++ Utilities/typemap.h
+@@ -196,7 +196,11 @@ namespace utils
+ 
+ 	// Type information for each used type
+ 	template <typename T>
++#if defined(__clang__) && (__clang_major__ > 6 || (__clang_major__ == 6 && __clang_patchlevel__ > 0))
++	const typeinfo<T> g_typeinfo{};
++#else
+ 	inline const typeinfo<T> g_typeinfo{};
++#endif
+ 
+ 	template <typename T, typename B>
+ 	struct typepoly


More information about the svn-ports-branches mailing list