Index: head/devel/tbb/Makefile =================================================================== --- head/devel/tbb/Makefile (revision 477644) +++ head/devel/tbb/Makefile (revision 477645) @@ -1,68 +1,68 @@ # Created by: Arun Sharma # $FreeBSD$ PORTNAME= tbb -PORTVERSION= 2018.2 +PORTVERSION= 2018.5 CATEGORIES= devel MAINTAINER= martymac@FreeBSD.org 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 USE_GITHUB= yes GH_ACCOUNT= 01org GH_TAGNAME= ${PORTVERSION:S/./_U/} SUB_FILES= tbb.pc SUB_LIST= prefix="${PREFIX}" \ name="${PORTNAME}" \ description="${COMMENT}" \ version="${PORTVERSION}" OPTIONS_DEFINE= DOCS PORTDOCS= * USE_LDCONFIG= yes ALL_TARGET= default CC_BASENAME= ${CC:C,^.*/,,} .include post-extract: .if ${CC_BASENAME} != ${COMPILER_TYPE} @${LN} -sf FreeBSD.${COMPILER_TYPE}.inc ${WRKSRC}/build/FreeBSD.${CC_BASENAME}.inc .endif @${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/ post-patch: @${REINPLACE_CMD} \ -e '/^CONLY =/s|^CONLY =.*|CONLY = ${CC}|' \ -e '/^CPLUS =/s|^CPLUS =.*|CPLUS = ${CXX}|' \ ${WRKSRC}/build/FreeBSD.${COMPILER_TYPE}.inc do-install: cd ${WRKSRC}; \ ${INSTALL_LIB} build/FreeBSD*release/libtbb.so \ ${STAGEDIR}${PREFIX}/lib/libtbb.so.2; \ ${LN} -sf libtbb.so.2 \ ${STAGEDIR}${PREFIX}/lib/libtbb.so; \ ${INSTALL_LIB} build/FreeBSD*release/libtbbmalloc.so \ ${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so.2; \ ${LN} -sf libtbbmalloc.so.2 \ ${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so; \ ${MKDIR} ${STAGEDIR}${PREFIX}/include/tbb/; \ cd include/tbb/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/tbb/ ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} post-install: ${INSTALL_DATA} ${WRKDIR}/tbb.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include Index: head/devel/tbb/distinfo =================================================================== --- head/devel/tbb/distinfo (revision 477644) +++ head/devel/tbb/distinfo (revision 477645) @@ -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 Index: head/devel/tbb/files/patch-build-FreeBSD.inc =================================================================== --- head/devel/tbb/files/patch-build-FreeBSD.inc (revision 477644) +++ head/devel/tbb/files/patch-build-FreeBSD.inc (revision 477645) @@ -1,35 +1,38 @@ ---- 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 ifndef runtime - clang_version:=$(shell clang -v 2>&1 | grep version | sed "s/.*version \([0-9]*\.[0-9]*\).*/\1/") + clang_version:=$(shell $(CC) -dumpversion) os_version:=$(shell uname -r) os_kernel_version:=$(shell uname -r | sed -e 's/-.*$$//') export runtime:=cc$(clang_version)_kernel$(os_kernel_version) endif -native_compiler := clang -export compiler ?= clang +native_compiler := $(CC) +export compiler ?= $(CC) debugger ?= gdb CMD=$(SHELL) -c -@@ -46,7 +49,7 @@ +@@ -46,7 +52,7 @@ RD?=rmdir MD?=mkdir -p NUL= /dev/null SLASH=/ -MAKE_VERSIONS=sh $(tbb_root)/build/version_info_linux.sh $(VERSION_FLAGS) >version_string.ver +MAKE_VERSIONS=sh $(tbb_root)/build/version_info_FreeBSD.sh $(VERSION_FLAGS) >version_string.ver MAKE_TBBVARS=sh $(tbb_root)/build/generate_tbbvars.sh ifdef LD_LIBRARY_PATH Index: head/devel/tbb/pkg-plist =================================================================== --- head/devel/tbb/pkg-plist (revision 477644) +++ head/devel/tbb/pkg-plist (revision 477645) @@ -1,113 +1,114 @@ include/tbb/aggregator.h include/tbb/aligned_space.h 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 include/tbb/compat/ppl.h include/tbb/compat/thread include/tbb/compat/tuple include/tbb/concurrent_hash_map.h include/tbb/concurrent_lru_cache.h include/tbb/concurrent_priority_queue.h include/tbb/concurrent_queue.h include/tbb/concurrent_unordered_map.h include/tbb/concurrent_unordered_set.h include/tbb/concurrent_vector.h include/tbb/critical_section.h include/tbb/enumerable_thread_specific.h include/tbb/flow_graph.h include/tbb/flow_graph_abstractions.h include/tbb/flow_graph_opencl_node.h include/tbb/global_control.h include/tbb/gfx_factory.h include/tbb/index.html include/tbb/internal/_aggregator_impl.h include/tbb/internal/_concurrent_queue_impl.h include/tbb/internal/_concurrent_unordered_impl.h include/tbb/internal/_flow_graph_async_msg_impl.h include/tbb/internal/_flow_graph_body_impl.h include/tbb/internal/_flow_graph_cache_impl.h include/tbb/internal/_flow_graph_impl.h include/tbb/internal/_flow_graph_indexer_impl.h include/tbb/internal/_flow_graph_item_buffer_impl.h include/tbb/internal/_flow_graph_join_impl.h include/tbb/internal/_flow_graph_node_impl.h include/tbb/internal/_flow_graph_streaming_node.h include/tbb/internal/_flow_graph_tagged_buffer_impl.h include/tbb/internal/_flow_graph_trace_impl.h include/tbb/internal/_flow_graph_types_impl.h include/tbb/internal/_mutex_padding.h include/tbb/internal/_range_iterator.h include/tbb/internal/_tbb_hash_compare_impl.h include/tbb/internal/_tbb_strings.h include/tbb/internal/_tbb_trace_impl.h 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 include/tbb/machine/ibm_aix51.h include/tbb/machine/icc_generic.h include/tbb/machine/linux_common.h include/tbb/machine/linux_ia32.h include/tbb/machine/linux_ia64.h include/tbb/machine/linux_intel64.h include/tbb/machine/mac_ppc.h include/tbb/machine/macos_common.h include/tbb/machine/mic_common.h include/tbb/machine/msvc_armv7.h include/tbb/machine/msvc_ia32_common.h include/tbb/machine/sunos_sparc.h include/tbb/machine/windows_api.h include/tbb/machine/windows_ia32.h include/tbb/machine/windows_intel64.h include/tbb/memory_pool.h include/tbb/mutex.h include/tbb/null_mutex.h include/tbb/null_rw_mutex.h include/tbb/parallel_do.h include/tbb/parallel_for.h include/tbb/parallel_for_each.h include/tbb/parallel_invoke.h include/tbb/parallel_reduce.h include/tbb/parallel_scan.h include/tbb/parallel_sort.h include/tbb/parallel_while.h include/tbb/partitioner.h include/tbb/pipeline.h include/tbb/queuing_mutex.h include/tbb/queuing_rw_mutex.h include/tbb/reader_writer_lock.h include/tbb/recursive_mutex.h include/tbb/runtime_loader.h include/tbb/scalable_allocator.h include/tbb/spin_mutex.h include/tbb/spin_rw_mutex.h include/tbb/task.h include/tbb/task_arena.h include/tbb/task_group.h include/tbb/task_scheduler_init.h include/tbb/task_scheduler_observer.h include/tbb/tbb.h include/tbb/tbb_allocator.h include/tbb/tbb_config.h include/tbb/tbb_disable_exceptions.h include/tbb/tbb_exception.h include/tbb/tbb_machine.h include/tbb/tbb_profiling.h include/tbb/tbb_stddef.h include/tbb/tbb_thread.h include/tbb/tbbmalloc_proxy.h include/tbb/tick_count.h lib/libtbb.so lib/libtbb.so.2 lib/libtbbmalloc.so lib/libtbbmalloc.so.2 libdata/pkgconfig/tbb.pc