diff --git a/parallel/threadingbuildingblocks/Makefile b/parallel/threadingbuildingblocks/Makefile index ee12eb68f42c..21c61d83d360 100644 --- a/parallel/threadingbuildingblocks/Makefile +++ b/parallel/threadingbuildingblocks/Makefile @@ -1,33 +1,33 @@ -# $NetBSD: Makefile,v 1.8 2018/01/01 18:16:38 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2020/09/05 11:34:07 ryoon Exp $ -DISTNAME= tbb30_20110325oss_src -PKGNAME= threadingbuildingblocks-3.0.6 # for "3.0 update 6" +DISTNAME= oneTBB-2020.3 +PKGNAME= ${DISTNAME:S/oneTBB-/threadingbuildingblocks-/} CATEGORIES= parallel -MASTER_SITES= http://threadingbuildingblocks.org/uploads/76/168/3.0%20update%206/ -EXTRACT_SUFX= .tgz +MASTER_SITES= ${MASTER_SITE_GITHUB:=oneapi-src/} +EXTRACT_SUFX= .tar.gz +GITHUB_PROJECT= oneTBB +GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= asau@inbox.ru HOMEPAGE= https://www.threadingbuildingblocks.org/ COMMENT= Threading Buildling Blocks -WRKSRC= ${WRKDIR}/${DISTNAME:_src=} #tbb30_20101215oss - USE_LANGUAGES= c c++ USE_TOOLS= gmake pax MAKE_FLAGS= tbb_build_prefix=build # use fixed path +MAKE_FLAGS+= native_compiler=${CC_VERSION:C/-[[:digit:]].*//} +MAKE_FLAGS+= compiler=${CC_VERSION:C/-[[:digit:]].*//} BUILD_TARGET= default TEST_TARGET= test pre-configure: cd ${WRKSRC}/build/ && cp FreeBSD.gcc.inc NetBSD.gcc.inc && cp FreeBSD.inc NetBSD.inc -INSTALLATION_DIRS= include lib share/doc/${PKGBASE} +INSTALLATION_DIRS= include lib do-install: ${INSTALL_LIB} ${WRKSRC}/build/build_release/libtbb.so ${DESTDIR}${PREFIX}/lib/ ${INSTALL_LIB} ${WRKSRC}/build/build_release/libtbbmalloc.so ${DESTDIR}${PREFIX}/lib/ - ${INSTALL_LIB} ${WRKSRC}/build/build_debug/libtbb_debug.so ${DESTDIR}${PREFIX}/lib/ - ${INSTALL_LIB} ${WRKSRC}/build/build_debug/libtbbmalloc_debug.so ${DESTDIR}${PREFIX}/lib/ (cd ${WRKSRC}/include && pax -rw tbb ${DESTDIR}${PREFIX}/include/) # documentation: # (cd $(WRKSRC)/doc/html && pax -rw . $(DESTDIR)$(PREFIX)/share/doc/html/$(PKGBASE)/) diff --git a/parallel/threadingbuildingblocks/PLIST b/parallel/threadingbuildingblocks/PLIST index 37477b1baff9..25a742759c0d 100644 --- a/parallel/threadingbuildingblocks/PLIST +++ b/parallel/threadingbuildingblocks/PLIST @@ -1,14 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/08/27 19:48:13 asau Exp $ -include/tbb/_aggregator_internal.h -include/tbb/_concurrent_queue_internal.h -include/tbb/_concurrent_unordered_internal.h -include/tbb/_item_buffer.h -include/tbb/_tbb_windef.h +@comment $NetBSD: PLIST,v 1.2 2020/09/05 11:34:07 ryoon Exp $ +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 @@ -16,27 +13,75 @@ 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_map.h include/tbb/concurrent_priority_queue.h include/tbb/concurrent_queue.h +include/tbb/concurrent_set.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/graph.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/index.html +include/tbb/info.h +include/tbb/internal/_aggregator_impl.h +include/tbb/internal/_allocator_traits.h +include/tbb/internal/_concurrent_queue_impl.h +include/tbb/internal/_concurrent_skip_list_impl.h +include/tbb/internal/_concurrent_unordered_impl.h +include/tbb/internal/_deprecated_header_message_guard.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_node_set_impl.h +include/tbb/internal/_flow_graph_nodes_deduction.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/_node_handle_impl.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/_warning_suppress_disable_notice.h +include/tbb/internal/_warning_suppress_enable_notice.h +include/tbb/internal/_x86_eliding_mutex_impl.h +include/tbb/internal/_x86_rtm_rw_mutex_impl.h +include/tbb/iterators.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/machine/xbox360_ppc.h +include/tbb/memory_pool.h include/tbb/mutex.h include/tbb/null_mutex.h include/tbb/null_rw_mutex.h @@ -59,12 +104,14 @@ 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 @@ -73,6 +120,4 @@ include/tbb/tbb_thread.h include/tbb/tbbmalloc_proxy.h include/tbb/tick_count.h lib/libtbb.so -lib/libtbb_debug.so lib/libtbbmalloc.so -lib/libtbbmalloc_debug.so diff --git a/parallel/threadingbuildingblocks/buildlink3.mk b/parallel/threadingbuildingblocks/buildlink3.mk index 96ce2f21455d..6b587900bbff 100644 --- a/parallel/threadingbuildingblocks/buildlink3.mk +++ b/parallel/threadingbuildingblocks/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/08/27 19:48:13 asau Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2020/09/05 11:34:07 ryoon Exp $ BUILDLINK_TREE+= threadingbuildingblocks .if !defined(THREADINGBUILDINGBLOCKS_BUILDLINK3_MK) THREADINGBUILDINGBLOCKS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.threadingbuildingblocks+= threadingbuildingblocks>=3.0.6 +BUILDLINK_API_DEPENDS.threadingbuildingblocks+= threadingbuildingblocks>=2020.3 BUILDLINK_PKGSRCDIR.threadingbuildingblocks?= ../../parallel/threadingbuildingblocks .endif # THREADINGBUILDINGBLOCKS_BUILDLINK3_MK diff --git a/parallel/threadingbuildingblocks/distinfo b/parallel/threadingbuildingblocks/distinfo index 7a78193ba1f4..2c4e34020931 100644 --- a/parallel/threadingbuildingblocks/distinfo +++ b/parallel/threadingbuildingblocks/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.3 2015/11/02 23:46:13 agc Exp $ +$NetBSD: distinfo,v 1.4 2020/09/05 11:34:07 ryoon Exp $ -SHA1 (tbb30_20110325oss_src.tgz) = b58650cdaa8e8497de2a797af1d03dcfc1c63351 -RMD160 (tbb30_20110325oss_src.tgz) = c95aa788d518d806b516b9e9e179d93bce19aa9c -SHA512 (tbb30_20110325oss_src.tgz) = 56498482bdcbe87f0a4d59234de0ba888b1e0770aff28dbe6e5b6c169e8c0b1987480db6cf4d1aab5c3da97ca5da626469237643df44762ba76121d4d93629b9 -Size (tbb30_20110325oss_src.tgz) = 1880565 bytes -SHA1 (patch-build_FreeBSD.gcc.inc) = f3f0e418b1eda91646e9e9cc9c34d40865eb7514 +SHA1 (oneTBB-2020.3.tar.gz) = ae543670251a6d667e6f077ecfab0d5bb09b270c +RMD160 (oneTBB-2020.3.tar.gz) = 1f3918c0dadfcddd2b38f398299de0d8542f11b4 +SHA512 (oneTBB-2020.3.tar.gz) = ea1ffd22c7234d715b8c46a4e51b40719c7a9b8837ab3166f1da5a2c6061167c2be2126b1d74fd361eec6975b8fce0df26829ca2e7af8029edbb52e40f23d630 +Size (oneTBB-2020.3.tar.gz) = 2639737 bytes diff --git a/parallel/threadingbuildingblocks/patches/patch-build_FreeBSD.gcc.inc b/parallel/threadingbuildingblocks/patches/patch-build_FreeBSD.gcc.inc deleted file mode 100644 index 4778909f6280..000000000000 --- a/parallel/threadingbuildingblocks/patches/patch-build_FreeBSD.gcc.inc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-build_FreeBSD.gcc.inc,v 1.1 2013/10/20 17:58:06 joerg Exp $ - ---- build/FreeBSD.gcc.inc.orig 2013-10-18 13:29:39.000000000 +0000 -+++ build/FreeBSD.gcc.inc -@@ -88,7 +88,7 @@ endif - # Setting tbbmalloc data. - #------------------------------------------------------------------------------ - --M_CPLUS_FLAGS = $(CPLUS_FLAGS) -fno-rtti -fno-exceptions -fno-schedule-insns2 -+M_CPLUS_FLAGS = $(CPLUS_FLAGS) -fno-rtti -fno-exceptions - - #------------------------------------------------------------------------------ - # End of setting tbbmalloc data.