svn commit: r558718 - in head/misc/thrill: . files

[Yuri Victorovich]

Author: yuri
Date: Sun Dec 20 07:49:34 2020
New Revision: 558718
URL: https://svnweb.freebsd.org/changeset/ports/558718

Log:
  misc/thrill: Not for 32-bit architectures; Add workaround for missing header; Force clang-10 because clang-11 crashes.
  
  Reported by:	fallout

Added:
  head/misc/thrill/files/patch-misc_json2profile.cpp   (contents, props changed)
Modified:
  head/misc/thrill/Makefile

Modified: head/misc/thrill/Makefile
==============================================================================
--- head/misc/thrill/Makefile	Sun Dec 20 07:01:59 2020	(r558717)
+++ head/misc/thrill/Makefile	Sun Dec 20 07:49:34 2020	(r558718)
@@ -10,6 +10,8 @@ COMMENT=	C++ framework for algorithmic distributed Big
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+NOT_FOR_ARCHS=	i386 # static_assert failed due to requirement 'sizeof(unsigned int) == 8' "FOXXLL supports only 64-bit builds"
+
 LIB_DEPENDS=	libmpi.so:net/openmpi
 
 USES=		cmake compiler:c++17-lang fortran
@@ -28,4 +30,14 @@ GH_TUPLE=	USCiLab:cereal:2f9471bc401590cf58b38bbbc33d4
 		tlx:tlx:89397b7fa1aa5631b4b84e53a92d6c5e06044d43:tlx_tlx/extlib/tlx \
 		stxxl:foxxll:a4a8aeee64743f845c5851e8b089965ea1c219d7:stxxl_foxxll/extlib/foxxll
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == clang
+LLVM_VERSION=	10 # clang-11 crashes: https://bugs.llvm.org/show_bug.cgi?id=48562
+BUILD_DEPENDS+=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
+CPP=		clang-cpp${LLVM_VERSION}
+CC=		clang${LLVM_VERSION}
+CXX=		clang++${LLVM_VERSION}
+.endif
+
+.include <bsd.port.post.mk>

Added: head/misc/thrill/files/patch-misc_json2profile.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/thrill/files/patch-misc_json2profile.cpp	Sun Dec 20 07:49:34 2020	(r558718)
@@ -0,0 +1,11 @@
+--- misc/json2profile.cpp.orig	2020-12-20 07:39:23 UTC
++++ misc/json2profile.cpp
+@@ -29,6 +29,8 @@
+ #include <utility>
+ #include <vector>
+ 
++#include <stdio.h> // missing header: https://github.com/thrill/thrill/issues/203
++
+ using namespace thrill; // NOLINT
+ using tlx::escape_html;
+