Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Dec 2019 11:37:45 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r520797 - head/devel/intel-graphics-compiler
Message-ID:  <201912241137.xBOBbjCG067595@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Dec 24 11:37:45 2019
New Revision: 520797
URL: https://svnweb.freebsd.org/changeset/ports/520797

Log:
  devel/intel-graphics-compiler: unbreak on DragonFly
  
  In file included from IGC/Compiler/GenUpdateCB.cpp:46:
  IGC/../3d/common/iStdLib/MemCopy.h:103:25: error: expected initializer before 'FastBlockCopyFromUSWC_SSE4_1_movntdqa_movdqa'
   inline void  __fastcall FastBlockCopyFromUSWC_SSE4_1_movntdqa_movdqa(void* dst, const void* src );
                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  IGC/../3d/common/iStdLib/MemCopy.h:104:25: error: expected initializer before 'FastBlockCopyFromUSWC_SSE4_1_movntdqa_movdqu'
   inline void  __fastcall FastBlockCopyFromUSWC_SSE4_1_movntdqa_movdqu(void* dst, const void* src );
                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  Reported by:	DPorts

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

Modified: head/devel/intel-graphics-compiler/Makefile
==============================================================================
--- head/devel/intel-graphics-compiler/Makefile	Tue Dec 24 11:26:20 2019	(r520796)
+++ head/devel/intel-graphics-compiler/Makefile	Tue Dec 24 11:37:45 2019	(r520797)
@@ -23,6 +23,7 @@ USES=		bison cmake compiler:c++17-lang python:build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	intel
+CFLAGS+=	-Wno-macro-redefined # __fastcall
 PLIST_SUB=	ARCH_SUFX=${ARCH:S/i386/32/:S/amd//:S/x86_//}
 
 post-patch:
@@ -36,9 +37,6 @@ post-patch:
 	@${REINPLACE_CMD} -e '/clang-\$$/ { s//clang$$/; \
 			s/MAJOR}/&$${LLVM_VERSION_MINOR}/; }' \
 		${WRKSRC}/IGC/BiFModule/CMakeLists.txt
-# Silence -Wmacro-redefined to expose __fastcall misuse
-	@${REINPLACE_CMD} -e '/__fastcall/d' \
-		${WRKSRC}/inc/common/UFO/portable_compiler.h
 # No need to abort on every benign warning enabled by default
 	@${REINPLACE_CMD} -e 's/"-Werror"//; /-Werror/d' \
 		${WRKSRC}/IGC/CMakeLists.txt



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912241137.xBOBbjCG067595>