From d00b2e0b5b8a4aa00f7f3ade3bcdd1acd1e6e179 Mon Sep 17 00:00:00 2001 From: Mohamed Akram Date: Sat, 2 May 2026 11:50:56 +0400 Subject: [PATCH] various ports: update onetbb handling --- R/R-RcppParallel/Portfile | 7 +------ R/R-proxyC/Portfile | 6 +----- R/R-proxyC/files/patch-Makevars.diff | 4 ++-- R/R-quanteda.textstats/Portfile | 6 +----- R/R-quanteda.textstats/files/patch-Makevars.diff | 4 ++-- R/R-quanteda/Portfile | 6 +----- R/R-quanteda/files/patch-Makevars.diff | 4 ++-- R/R-seededlda/Portfile | 6 +----- databases/rocksdb/Portfile | 4 +--- devel/pika/Portfile | 5 ++--- graphics/openimageio/Portfile | 4 +--- graphics/openvdb/Portfile | 5 +---- graphics/viskores/Portfile | 3 +-- math/TOPCOM/Portfile | 4 +--- python/py-numba/Portfile | 4 +--- 15 files changed, 19 insertions(+), 53 deletions(-) diff --git a/R/R-RcppParallel/Portfile b/R/R-RcppParallel/Portfile index cb82aab7664..e320137ffeb 100644 --- a/R/R-RcppParallel/Portfile +++ b/R/R-RcppParallel/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup R 1.0 R.setup cran RcppCore RcppParallel 5.1.9 -revision 0 +revision 1 categories-append devel maintainers nomaintainer license GPL-3 @@ -20,14 +20,9 @@ checksums rmd160 b6a008b22124aa107d8ee13aaeefba72be2fa289 \ # https://github.com/stan-dev/rstan/issues/979 depends_lib-append port:onetbb -build.env-append TBB_INC=${prefix}/libexec/onetbb/include \ - TBB_LIB=${prefix}/libexec/onetbb/lib - depends_test-append port:R-knitr \ port:R-Rcpp \ port:R-rmarkdown \ port:R-RUnit test.run yes -test.env-append TBB_INC=${prefix}/libexec/onetbb/include \ - TBB_LIB=${prefix}/libexec/onetbb/lib diff --git a/R/R-proxyC/Portfile b/R/R-proxyC/Portfile index 0968fb68bc0..71f2fadc7d3 100644 --- a/R/R-proxyC/Portfile +++ b/R/R-proxyC/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup R 1.0 R.setup cran koheiw proxyC 0.4.1 -revision 1 +revision 2 categories-append math maintainers nomaintainer license GPL-3 @@ -21,10 +21,6 @@ checksums rmd160 e45af70f0ad5d17c6f21abb614424518d46811b7 \ # https://github.com/koheiw/proxyC/issues/50 patchfiles patch-Makevars.diff -post-patch { - reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/Makevars.in -} - depends_lib-append port:onetbb \ port:R-Rcpp \ port:R-RcppArmadillo diff --git a/R/R-proxyC/files/patch-Makevars.diff b/R/R-proxyC/files/patch-Makevars.diff index ab09ee2f899..121abe43d89 100644 --- a/R/R-proxyC/files/patch-Makevars.diff +++ b/R/R-proxyC/files/patch-Makevars.diff @@ -3,5 +3,5 @@ @@ -1,2 +1,2 @@ -PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) @TBB_LIBS@ -PKG_CXXFLAGS = -DARMA_64BIT_WORD=1 @TBB_CFLAGS@ -+PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -L@PREFIX@/libexec/onetbb/lib -ltbb -+PKG_CXXFLAGS = -DTBB -I@PREFIX@/libexec/onetbb/include -DARMA_64BIT_WORD=1 ++PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -ltbb ++PKG_CXXFLAGS = -DTBB -DARMA_64BIT_WORD=1 diff --git a/R/R-quanteda.textstats/Portfile b/R/R-quanteda.textstats/Portfile index ce8f2ac96da..8dc15e65a22 100644 --- a/R/R-quanteda.textstats/Portfile +++ b/R/R-quanteda.textstats/Portfile @@ -5,7 +5,7 @@ PortGroup R 1.0 # GitHub version lags behind. R.setup cran quanteda quanteda.textstats 0.97.2 -revision 0 +revision 1 categories-append textproc maintainers nomaintainer license GPL-3 @@ -20,10 +20,6 @@ checksums rmd160 0fb18c3671c1ecd54a21f1b20307d5570573b5cd \ # Help it. patchfiles patch-Makevars.diff -post-patch { - reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/Makevars -} - depends_lib-append port:onetbb \ port:R-nsyllable \ port:R-proxyC \ diff --git a/R/R-quanteda.textstats/files/patch-Makevars.diff b/R/R-quanteda.textstats/files/patch-Makevars.diff index 5aad8544a9a..32e2a9822c8 100644 --- a/R/R-quanteda.textstats/files/patch-Makevars.diff +++ b/R/R-quanteda.textstats/files/patch-Makevars.diff @@ -3,5 +3,5 @@ @@ -1,2 +1,2 @@ -PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/libtbb.R` -PKG_CXXFLAGS = -DARMA_64BIT_WORD=1 `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/deftbb.R` -+PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -L@PREFIX@/libexec/onetbb/lib `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/libtbb.R` -+PKG_CXXFLAGS = -I@PREFIX@/libexec/onetbb/include -DARMA_64BIT_WORD=1 `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/deftbb.R` ++PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/libtbb.R` ++PKG_CXXFLAGS = -DARMA_64BIT_WORD=1 `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/deftbb.R` diff --git a/R/R-quanteda/Portfile b/R/R-quanteda/Portfile index 6cc298e7273..8fdcfdd6921 100644 --- a/R/R-quanteda/Portfile +++ b/R/R-quanteda/Portfile @@ -5,7 +5,7 @@ PortGroup R 1.0 # Revert to GitHub once updated there. R.setup cran quanteda quanteda 4.0.2 -revision 0 +revision 1 categories-append textproc maintainers nomaintainer license GPL-3 @@ -41,10 +41,6 @@ depends_lib-append port:onetbb \ # configure script is broken and does nothing. patchfiles patch-Makevars.diff -post-patch { - reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/Makevars.in -} - compilers.setup require_fortran depends_test-append port:R-dplyr \ diff --git a/R/R-quanteda/files/patch-Makevars.diff b/R/R-quanteda/files/patch-Makevars.diff index cbf5d0f4e7c..74a87db7c87 100644 --- a/R/R-quanteda/files/patch-Makevars.diff +++ b/R/R-quanteda/files/patch-Makevars.diff @@ -3,5 +3,5 @@ @@ -1,2 +1,2 @@ -PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) @TBB_LIBS@ -PKG_CXXFLAGS = -I../inst/include @TBB_CFLAGS@ -+PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -L@PREFIX@/libexec/onetbb/lib -ltbb -+PKG_CXXFLAGS = -DTBB -I@PREFIX@/libexec/onetbb/include -I../inst/include ++PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -ltbb ++PKG_CXXFLAGS = -DTBB -I../inst/include diff --git a/R/R-seededlda/Portfile b/R/R-seededlda/Portfile index e411da31a28..7dced518568 100644 --- a/R/R-seededlda/Portfile +++ b/R/R-seededlda/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup R 1.0 R.setup cran koheiw seededlda 1.4.1 -revision 0 +revision 1 categories-append textproc maintainers nomaintainer license GPL-3 @@ -41,10 +41,6 @@ post-patch { reinplace "s|@BIT@|${bitness}|g" ${worksrcpath}/configure } -build.env-append PKG_CONFIG_PATH=${prefix}/libexec/onetbb/lib/pkgconfig \ - TBBFLAGS=${prefix}/libexec/onetbb/include \ - TBBLIBS=${prefix}/libexec/onetbb/lib - depends_lib-append port:onetbb \ port:R-proxyC \ port:R-quanteda \ diff --git a/databases/rocksdb/Portfile b/databases/rocksdb/Portfile index addc04a62e9..eb16509baf7 100644 --- a/databases/rocksdb/Portfile +++ b/databases/rocksdb/Portfile @@ -9,7 +9,7 @@ PortGroup legacysupport 1.1 legacysupport.newest_darwin_requires_legacy 10 github.setup facebook rocksdb 10.1.3 v -revision 0 +revision 1 categories databases devel license BSD @@ -86,6 +86,4 @@ variant tbb description "Use TBB" { port:onetbb configure.args-replace \ -DWITH_TBB=OFF -DWITH_TBB=ON - configure.args-append \ - -DTBB_ROOT_DIR=${prefix}/libexec/onetbb } diff --git a/devel/pika/Portfile b/devel/pika/Portfile index bd9d48a8418..5dafa12f892 100644 --- a/devel/pika/Portfile +++ b/devel/pika/Portfile @@ -13,7 +13,7 @@ legacysupport.use_mp_libcxx yes legacysupport.newest_darwin_requires_legacy 18 github.setup pika-org pika 0.30.1 -revision 0 +revision 1 categories devel parallel license Boost-1 maintainers nomaintainer @@ -118,8 +118,7 @@ variant tbb conflicts jemalloc description "Use oneTBB instead of system malloc" depends_lib-append \ port:onetbb configure.args-append \ - -DPIKA_WITH_MALLOC=tbbmalloc \ - -DTBBMALLOC_ROOT=${prefix}/libexec/onetbb + -DPIKA_WITH_MALLOC=tbbmalloc } variant tests description "Enable testing" { diff --git a/graphics/openimageio/Portfile b/graphics/openimageio/Portfile index bc83a70f2c2..3e01e171852 100644 --- a/graphics/openimageio/Portfile +++ b/graphics/openimageio/Portfile @@ -19,7 +19,7 @@ set port_latest [expr {${os.platform} ne "darwin" || ${os.major} >= 20}] if {${port_latest}} { github.setup AcademySoftwareFoundation OpenImageIO 2.5.10.1 v - revision 4 + revision 5 checksums rmd160 acca3794870850f6d39e41e62e9370bf6ff9565b \ sha256 8f6a547f6a5d510737ba436f867043db537def65f0fdb14ec30e5a185b619f93 \ size 52061055 @@ -40,8 +40,6 @@ if {${port_latest}} { port:openexr \ port:openvdb \ port:onetbb - #configure.args-append -DUSE_TBB=OFF - configure.args-append -DTBB_ROOT=${prefix}/libexec/onetbb set ffmpeg_ver 6 diff --git a/graphics/openvdb/Portfile b/graphics/openvdb/Portfile index 124b835c698..3b77767ce1b 100644 --- a/graphics/openvdb/Portfile +++ b/graphics/openvdb/Portfile @@ -8,7 +8,7 @@ PortGroup boost 1.0 github.setup AcademySoftwareFoundation openvdb 11.0.0 v github.tarball_from archive -revision 2 +revision 3 categories graphics license {MPL-2 LGPL-2.1+} maintainers {mcalhoun @MarcusCalhoun-Lopez} \ @@ -45,9 +45,6 @@ depends_lib-append port:zlib \ port:onetbb \ path:lib/pkgconfig/glfw3.pc:glfw -configure.args-append -DTBB_INCLUDEDIR=${prefix}/libexec/onetbb/include \ - -DTBB_LIBRARYDIR=${prefix}/libexec/onetbb/lib - # Disable building command-line tools. # We control whether to build them using the +utils variant below. configure.args-append -DOPENVDB_BUILD_BINARIES=OFF diff --git a/graphics/viskores/Portfile b/graphics/viskores/Portfile index fb28b0e5dac..f73ef0208c4 100644 --- a/graphics/viskores/Portfile +++ b/graphics/viskores/Portfile @@ -6,7 +6,7 @@ PortGroup github 1.0 github.setup Viskores viskores 1.1.1 v github.tarball_from archive -revision 0 +revision 1 categories graphics science devel license BSD @@ -46,7 +46,6 @@ variant openmp description {Enable OpenMP support} { variant tbb description {Enable Intel Threading Building Blocks support} { configure.args-append -DViskores_ENABLE_TBB=ON - configure.env-append TBB_ROOT=${prefix}/libexec/onetbb depends_lib-append port:onetbb } diff --git a/math/TOPCOM/Portfile b/math/TOPCOM/Portfile index 74b37e292bf..c58a07c231a 100644 --- a/math/TOPCOM/Portfile +++ b/math/TOPCOM/Portfile @@ -8,7 +8,7 @@ boost.version 1.81 name TOPCOM version 1.1.2 -revision 1 +revision 2 categories math license GPL-2+ @@ -59,8 +59,6 @@ configure.args --enable-soplex \ # /opt/local/include/papilo/misc/tbb.hpp: fatal error: # tbb/blocked_range.h: No such file or directory depends_build-append port:onetbb -configure.cppflags-append \ - -I${prefix}/libexec/onetbb/include livecheck.type regex livecheck.regex "Download ${name}-(\[\\d.\]+)" diff --git a/python/py-numba/Portfile b/python/py-numba/Portfile index 298ba3a06db..a527d420c73 100644 --- a/python/py-numba/Portfile +++ b/python/py-numba/Portfile @@ -5,7 +5,7 @@ PortGroup python 1.0 name py-numba version 0.65.0 -revision 0 +revision 1 categories-append devel license BSD @@ -47,8 +47,6 @@ variant tbb description "Add TBB support" { build.env-delete NUMBA_DISABLE_TBB=1 depends_lib-append port:onetbb - - build.env-append TBBROOT=${prefix}/libexec/onetbb } if {${name} ne ${subport}} {