macports/macports-ports
0
0
Fork 0
mirror of https://github.com/macports/macports-ports.git synced 2026-07-12 18:20:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

various ports: update onetbb handling

Browse Source
This commit is contained in:
Mohamed Akram
2026-05-02 11:50:56 +04:00
parent 9ffc6c7f6a
commit d00b2e0b5b
15 changed files with 19 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
R/R-RcppParallel/Portfile
+1 -6
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup R 1.0 PortGroup R 1.0
R.setup cran RcppCore RcppParallel 5.1.9 R.setup cran RcppCore RcppParallel 5.1.9
revision 0 revision 1
categories-append devel categories-append devel
maintainers nomaintainer maintainers nomaintainer
license GPL-3 license GPL-3
@@ -20,14 +20,9 @@ checksums rmd160 b6a008b22124aa107d8ee13aaeefba72be2fa289 \
# https://github.com/stan-dev/rstan/issues/979 # https://github.com/stan-dev/rstan/issues/979
depends_lib-append port:onetbb 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 \ depends_test-append port:R-knitr \
port:R-Rcpp \ port:R-Rcpp \
port:R-rmarkdown \ port:R-rmarkdown \
port:R-RUnit port:R-RUnit
test.run yes test.run yes
test.env-append TBB_INC=${prefix}/libexec/onetbb/include \
TBB_LIB=${prefix}/libexec/onetbb/lib
R/R-proxyC/Portfile
+1 -5
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup R 1.0 PortGroup R 1.0
R.setup cran koheiw proxyC 0.4.1 R.setup cran koheiw proxyC 0.4.1
revision 1 revision 2
categories-append math categories-append math
maintainers nomaintainer maintainers nomaintainer
license GPL-3 license GPL-3
@@ -21,10 +21,6 @@ checksums rmd160 e45af70f0ad5d17c6f21abb614424518d46811b7 \
# https://github.com/koheiw/proxyC/issues/50 # https://github.com/koheiw/proxyC/issues/50
patchfiles patch-Makevars.diff patchfiles patch-Makevars.diff
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/Makevars.in
}
depends_lib-append port:onetbb \ depends_lib-append port:onetbb \
port:R-Rcpp \ port:R-Rcpp \
port:R-RcppArmadillo port:R-RcppArmadillo
R/R-proxyC/files/patch-Makevars.diff
+2 -2
View File
@@ -3,5 +3,5 @@
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
-PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) @TBB_LIBS@ -PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) @TBB_LIBS@
-PKG_CXXFLAGS = -DARMA_64BIT_WORD=1 @TBB_CFLAGS@ -PKG_CXXFLAGS = -DARMA_64BIT_WORD=1 @TBB_CFLAGS@
+PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -L@PREFIX@/libexec/onetbb/lib -ltbb +PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -ltbb
+PKG_CXXFLAGS = -DTBB -I@PREFIX@/libexec/onetbb/include -DARMA_64BIT_WORD=1 +PKG_CXXFLAGS = -DTBB -DARMA_64BIT_WORD=1
R/R-quanteda.textstats/Portfile
+1 -5
View File
@@ -5,7 +5,7 @@ PortGroup R 1.0
# GitHub version lags behind. # GitHub version lags behind.
R.setup cran quanteda quanteda.textstats 0.97.2 R.setup cran quanteda quanteda.textstats 0.97.2
revision 0 revision 1
categories-append textproc categories-append textproc
maintainers nomaintainer maintainers nomaintainer
license GPL-3 license GPL-3
@@ -20,10 +20,6 @@ checksums rmd160 0fb18c3671c1ecd54a21f1b20307d5570573b5cd \
# Help it. # Help it.
patchfiles patch-Makevars.diff patchfiles patch-Makevars.diff
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/Makevars
}
depends_lib-append port:onetbb \ depends_lib-append port:onetbb \
port:R-nsyllable \ port:R-nsyllable \
port:R-proxyC \ port:R-proxyC \
R/R-quanteda.textstats/files/patch-Makevars.diff
+2 -2
View File
@@ -3,5 +3,5 @@
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
-PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/libtbb.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` -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_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) `$(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_CXXFLAGS = -DARMA_64BIT_WORD=1 `$(R_HOME)/bin${R_ARCH_BIN}/Rscript ../inst/deftbb.R`
R/R-quanteda/Portfile
+1 -5
View File
@@ -5,7 +5,7 @@ PortGroup R 1.0
# Revert to GitHub once updated there. # Revert to GitHub once updated there.
R.setup cran quanteda quanteda 4.0.2 R.setup cran quanteda quanteda 4.0.2
revision 0 revision 1
categories-append textproc categories-append textproc
maintainers nomaintainer maintainers nomaintainer
license GPL-3 license GPL-3
@@ -41,10 +41,6 @@ depends_lib-append port:onetbb \
# configure script is broken and does nothing. # configure script is broken and does nothing.
patchfiles patch-Makevars.diff patchfiles patch-Makevars.diff
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/Makevars.in
}
compilers.setup require_fortran compilers.setup require_fortran
depends_test-append port:R-dplyr \ depends_test-append port:R-dplyr \
R/R-quanteda/files/patch-Makevars.diff
+2 -2
View File
@@ -3,5 +3,5 @@
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
-PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) @TBB_LIBS@ -PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) @TBB_LIBS@
-PKG_CXXFLAGS = -I../inst/include @TBB_CFLAGS@ -PKG_CXXFLAGS = -I../inst/include @TBB_CFLAGS@
+PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -L@PREFIX@/libexec/onetbb/lib -ltbb +PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -ltbb
+PKG_CXXFLAGS = -DTBB -I@PREFIX@/libexec/onetbb/include -I../inst/include +PKG_CXXFLAGS = -DTBB -I../inst/include
R/R-seededlda/Portfile
+1 -5
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup R 1.0 PortGroup R 1.0
R.setup cran koheiw seededlda 1.4.1 R.setup cran koheiw seededlda 1.4.1
revision 0 revision 1
categories-append textproc categories-append textproc
maintainers nomaintainer maintainers nomaintainer
license GPL-3 license GPL-3
@@ -41,10 +41,6 @@ post-patch {
reinplace "s|@BIT@|${bitness}|g" ${worksrcpath}/configure 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 \ depends_lib-append port:onetbb \
port:R-proxyC \ port:R-proxyC \
port:R-quanteda \ port:R-quanteda \
databases/rocksdb/Portfile
+1 -3
View File
@@ -9,7 +9,7 @@ PortGroup legacysupport 1.1
legacysupport.newest_darwin_requires_legacy 10 legacysupport.newest_darwin_requires_legacy 10
github.setup facebook rocksdb 10.1.3 v github.setup facebook rocksdb 10.1.3 v
revision 0 revision 1
categories databases devel categories databases devel
license BSD license BSD
@@ -86,6 +86,4 @@ variant tbb description "Use TBB" {
port:onetbb port:onetbb
configure.args-replace \ configure.args-replace \
-DWITH_TBB=OFF -DWITH_TBB=ON -DWITH_TBB=OFF -DWITH_TBB=ON
configure.args-append \
-DTBB_ROOT_DIR=${prefix}/libexec/onetbb
} }
devel/pika/Portfile
+2 -3
View File
@@ -13,7 +13,7 @@ legacysupport.use_mp_libcxx yes
legacysupport.newest_darwin_requires_legacy 18 legacysupport.newest_darwin_requires_legacy 18
github.setup pika-org pika 0.30.1 github.setup pika-org pika 0.30.1
revision 0 revision 1
categories devel parallel categories devel parallel
license Boost-1 license Boost-1
maintainers nomaintainer maintainers nomaintainer
@@ -118,8 +118,7 @@ variant tbb conflicts jemalloc description "Use oneTBB instead of system malloc"
depends_lib-append \ depends_lib-append \
port:onetbb port:onetbb
configure.args-append \ configure.args-append \
-DPIKA_WITH_MALLOC=tbbmalloc \ -DPIKA_WITH_MALLOC=tbbmalloc
-DTBBMALLOC_ROOT=${prefix}/libexec/onetbb
} }
variant tests description "Enable testing" { variant tests description "Enable testing" {
graphics/openimageio/Portfile
+1 -3
View File
@@ -19,7 +19,7 @@ set port_latest [expr {${os.platform} ne "darwin" || ${os.major} >= 20}]
if {${port_latest}} { if {${port_latest}} {
github.setup AcademySoftwareFoundation OpenImageIO 2.5.10.1 v github.setup AcademySoftwareFoundation OpenImageIO 2.5.10.1 v
revision 4 revision 5
checksums rmd160 acca3794870850f6d39e41e62e9370bf6ff9565b \ checksums rmd160 acca3794870850f6d39e41e62e9370bf6ff9565b \
sha256 8f6a547f6a5d510737ba436f867043db537def65f0fdb14ec30e5a185b619f93 \ sha256 8f6a547f6a5d510737ba436f867043db537def65f0fdb14ec30e5a185b619f93 \
size 52061055 size 52061055
@@ -40,8 +40,6 @@ if {${port_latest}} {
port:openexr \ port:openexr \
port:openvdb \ port:openvdb \
port:onetbb port:onetbb
#configure.args-append -DUSE_TBB=OFF
configure.args-append -DTBB_ROOT=${prefix}/libexec/onetbb
set ffmpeg_ver 6 set ffmpeg_ver 6
graphics/openvdb/Portfile
+1 -4
View File
@@ -8,7 +8,7 @@ PortGroup boost 1.0
github.setup AcademySoftwareFoundation openvdb 11.0.0 v github.setup AcademySoftwareFoundation openvdb 11.0.0 v
github.tarball_from archive github.tarball_from archive
revision 2 revision 3
categories graphics categories graphics
license {MPL-2 LGPL-2.1+} license {MPL-2 LGPL-2.1+}
maintainers {mcalhoun @MarcusCalhoun-Lopez} \ maintainers {mcalhoun @MarcusCalhoun-Lopez} \
@@ -45,9 +45,6 @@ depends_lib-append port:zlib \
port:onetbb \ port:onetbb \
path:lib/pkgconfig/glfw3.pc:glfw 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. # Disable building command-line tools.
# We control whether to build them using the +utils variant below. # We control whether to build them using the +utils variant below.
configure.args-append -DOPENVDB_BUILD_BINARIES=OFF configure.args-append -DOPENVDB_BUILD_BINARIES=OFF
graphics/viskores/Portfile
+1 -2
View File
@@ -6,7 +6,7 @@ PortGroup github 1.0
github.setup Viskores viskores 1.1.1 v github.setup Viskores viskores 1.1.1 v
github.tarball_from archive github.tarball_from archive
revision 0 revision 1
categories graphics science devel categories graphics science devel
license BSD license BSD
@@ -46,7 +46,6 @@ variant openmp description {Enable OpenMP support} {
variant tbb description {Enable Intel Threading Building Blocks support} { variant tbb description {Enable Intel Threading Building Blocks support} {
configure.args-append -DViskores_ENABLE_TBB=ON configure.args-append -DViskores_ENABLE_TBB=ON
configure.env-append TBB_ROOT=${prefix}/libexec/onetbb
depends_lib-append port:onetbb depends_lib-append port:onetbb
} }
math/TOPCOM/Portfile
+1 -3
View File
@@ -8,7 +8,7 @@ boost.version 1.81
name TOPCOM name TOPCOM
version 1.1.2 version 1.1.2
revision 1 revision 2
categories math categories math
license GPL-2+ license GPL-2+
@@ -59,8 +59,6 @@ configure.args --enable-soplex \
# /opt/local/include/papilo/misc/tbb.hpp: fatal error: # /opt/local/include/papilo/misc/tbb.hpp: fatal error:
# tbb/blocked_range.h: No such file or directory # tbb/blocked_range.h: No such file or directory
depends_build-append port:onetbb depends_build-append port:onetbb
configure.cppflags-append \
-I${prefix}/libexec/onetbb/include
livecheck.type regex livecheck.type regex
livecheck.regex "Download ${name}-(\[\\d.\]+)" livecheck.regex "Download ${name}-(\[\\d.\]+)"
python/py-numba/Portfile
+1 -3
View File
@@ -5,7 +5,7 @@ PortGroup python 1.0
name py-numba name py-numba
version 0.65.0 version 0.65.0
revision 0 revision 1
categories-append devel categories-append devel
license BSD license BSD
@@ -47,8 +47,6 @@ variant tbb description "Add TBB support" {
build.env-delete NUMBA_DISABLE_TBB=1 build.env-delete NUMBA_DISABLE_TBB=1
depends_lib-append port:onetbb depends_lib-append port:onetbb
build.env-append TBBROOT=${prefix}/libexec/onetbb
} }
if {${name} ne ${subport}} { if {${name} ne ${subport}} {