From 658c44dec90607f457419fe8ad7aff8d0bfb7c71 Mon Sep 17 00:00:00 2001 From: Charlie Li Date: Sat, 4 Aug 2018 22:06:42 -0400 Subject: [PATCH] devel/tbb: update to 2018.5 and enable build for aarch64 --- devel/tbb/Makefile | 4 ++-- devel/tbb/distinfo | 6 +++--- devel/tbb/files/patch-build-FreeBSD.inc | 11 +++++++---- devel/tbb/pkg-plist | 3 ++- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git devel/tbb/Makefile devel/tbb/Makefile index e5d58feb920f..b3c2c528e762 100644 --- devel/tbb/Makefile +++ devel/tbb/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tbb -PORTVERSION= 2018.2 +PORTVERSION= 2018.5 CATEGORIES= devel MAINTAINER= martymac@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Library that provides thread building blocks LICENSE= APACHE20 -ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 +ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 ONLY_FOR_ARCHS_REASON= has not been ported to this platform USES= compiler gmake tar:tgz diff --git devel/tbb/distinfo devel/tbb/distinfo index ba5038ab256a..71e6d2a06546 100644 --- devel/tbb/distinfo +++ devel/tbb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1515705707 -SHA256 (01org-tbb-2018.2-2018_U2_GH0.tar.gz) = 78bb9bae474736d213342f01fe1a6d00c6939d5c75b367e2e43e7bf29a6d8eca -SIZE (01org-tbb-2018.2-2018_U2_GH0.tar.gz) = 2905393 +TIMESTAMP = 1533445358 +SHA256 (01org-tbb-2018.5-2018_U5_GH0.tar.gz) = c4c2896af527392496c5e01ef8579058a71b6eebbd695924cd138841c13f07be +SIZE (01org-tbb-2018.5-2018_U5_GH0.tar.gz) = 2922517 diff --git devel/tbb/files/patch-build-FreeBSD.inc devel/tbb/files/patch-build-FreeBSD.inc index 850c10ef7384..791b687a5817 100644 --- devel/tbb/files/patch-build-FreeBSD.inc +++ devel/tbb/files/patch-build-FreeBSD.inc @@ -1,11 +1,14 @@ ---- build/FreeBSD.inc.orig 2017-06-07 09:54:02.000000000 +0200 -+++ build/FreeBSD.inc 2017-08-20 18:12:29.329258000 +0200 -@@ -26,17 +26,20 @@ +--- build/FreeBSD.inc.orig 2018-06-19 16:04:20 UTC ++++ build/FreeBSD.inc +@@ -26,17 +26,23 @@ ifndef arch ifeq ($(shell uname -m),amd64) export arch:=intel64 endif + ifeq ($(shell uname -m),arm) + export arch:=armv7 ++ endif ++ ifeq ($(shell uname -m),arm64) ++ export arch:=arm64 + endif endif @@ -24,7 +27,7 @@ debugger ?= gdb CMD=$(SHELL) -c -@@ -46,7 +49,7 @@ +@@ -46,7 +52,7 @@ RD?=rmdir MD?=mkdir -p NUL= /dev/null SLASH=/ diff --git devel/tbb/pkg-plist devel/tbb/pkg-plist index b82a15cebfbd..1c2129575c3e 100644 --- devel/tbb/pkg-plist +++ devel/tbb/pkg-plist @@ -4,6 +4,7 @@ include/tbb/atomic.h include/tbb/blocked_range.h include/tbb/blocked_range2d.h include/tbb/blocked_range3d.h +include/tbb/blocked_rangeNd.h include/tbb/cache_aligned_allocator.h include/tbb/combinable.h include/tbb/compat/condition_variable @@ -49,7 +50,7 @@ include/tbb/internal/_tbb_windef.h include/tbb/internal/_template_helpers.h include/tbb/internal/_x86_eliding_mutex_impl.h include/tbb/internal/_x86_rtm_rw_mutex_impl.h -include/tbb/machine/gcc_armv7.h +include/tbb/machine/gcc_arm.h include/tbb/machine/gcc_generic.h include/tbb/machine/gcc_ia32_common.h include/tbb/machine/gcc_itsx.h -- 2.18.0