update

Author: kevinushey

NEWS.md

@@ -1,9 +1,10 @@
 
-## RcppParallel 5.1.10  (UNRELEASED)
+## RcppParallel 6.0.0  (UNRELEASED)
 
-* RcppParallel now bundles oneTBB 2022.0.0.
+* RcppParallel now bundles oneTBB 2022.0.0. Note that the TBB ABI has changed;
+  packages which depend on RcppParallel may need to be rebuilt.
 
-* On Windows, RcppParallel now uses the copy of TBB provided by Rtools, if any.
+* On Windows, RcppParallel now uses the copy of TBB provided by Rtools.
   If TBB is not available, RcppParallel will use only the fallback 'tinythread'
   implementation. In practice, this implies that RcppParallel will now only
   provide a TBB backend with R (>= 4.2.0).

src/Makevars.in

@@ -21,7 +21,7 @@ $(OBJECTS): tbb
 # NOTE: TBB libraries are installed via install.libs.R.
 # However, we need to copy headers here so that they are visible during compilation.
 tbb: tbb-clean
-	TBB_LIB="$(TBB_LIB)" TBB_INC="$(TBB_INC)"                   \
+	@TBB_LIB="$(TBB_LIB)" TBB_INC="$(TBB_INC)"                  \
 	TBB_NAME="$(TBB_NAME)" TBB_MALLOC_NAME="$(TBB_MALLOC_NAME)" \
 	CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"        \
 	CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)"	LDFLAGS="$(LDFLAGS)"    \

src/install.libs.R

@@ -142,6 +142,7 @@ useBundledTbb <- function() {
    tbbDir <- dirname(tbbFiles[[1L]])
 
    dir.create("tbb/build", showWarnings = FALSE)
+   unlink("tbb/build/lib_release", recursive = TRUE)
    file.rename(tbbDir, "tbb/build/lib_release")
    unlink("tbb/build-tbb", recursive = TRUE)
    writeLines("*** finished building tbb")