try to support older R + Windows

Author: kevinushey

R/aaa.R

@@ -3,4 +3,6 @@
 TBB_ENABLED <- TRUE
 TBB_LIB  <- ""
 TBB_INC  <- ""
-TBB_NAME <- "tbb"
+
+TBB_NAME <- "tbb"
+TBB_MALLOC_NAME <- "tbbmalloc"

R/tbb-autodetected.R.in

@@ -2,4 +2,6 @@
 TBB_ENABLED <- @TBB_ENABLED@
 TBB_LIB  <- "@TBB_LIB@"
 TBB_INC  <- "@TBB_INC@"
+
 TBB_NAME <- "@TBB_NAME@"
+TBB_MALLOC_NAME <- "@TBBMALLOC_NAME@"

R/tbb.R

@@ -61,6 +61,10 @@ tbbCxxFlags <- function() {
 
    # if TBB_INC is set, apply those library paths
    tbbInc <- Sys.getenv("TBB_INC", unset = TBB_INC)
+   if (!file.exists(tbbInc)) {
+      tbbInc <- system.file("include", package = "Rcpp")
+   }
+   
    if (nzchar(tbbInc)) {
 
       # add include path
@@ -96,15 +100,15 @@ tbbLdFlags <- function() {
    # shortcut if TBB_LIB defined
    tbbLib <- Sys.getenv("TBB_LINK_LIB", Sys.getenv("TBB_LIB", unset = TBB_LIB))
    if (nzchar(tbbLib)) {
-      fmt <- "-L%1$s -Wl,-rpath,%1$s -l%2$s -ltbbmalloc"
-      return(sprintf(fmt, asBuildPath(tbbLib), TBB_NAME))
+      fmt <- "-L%1$s -Wl,-rpath,%1$s -l%2$s -l%3$s"
+      return(sprintf(fmt, asBuildPath(tbbLib), TBB_NAME, TBB_MALLOC_NAME))
    }
 
    # explicitly link on macOS
    # https://github.com/RcppCore/RcppParallel/issues/206
    if (is_mac()) {
-      fmt <- "-L%s -l%s -ltbbmalloc"
-      return(sprintf(fmt, asBuildPath(tbbLibraryPath()), TBB_NAME))
+      fmt <- "-L%s -l%s -l%s"
+      return(sprintf(fmt, asBuildPath(tbbLibraryPath()), TBB_NAME, TBB_MALLOC_NAME))
    }
 
    # nothing required on other platforms

src/Makevars.in

@@ -2,9 +2,10 @@
 CMAKE = @CMAKE@
 R = @R@
 
-TBB_LIB   = @TBB_LIB@
-TBB_INC   = @TBB_INC@
-TBB_NAME  = @TBB_NAME@
+TBB_LIB         = @TBB_LIB@
+TBB_INC         = @TBB_INC@
+TBB_NAME        = @TBB_NAME@
+TBB_MALLOC_NAME = @TBB_MALLOC_NAME@
 
 PKG_CPPFLAGS = @PKG_CPPFLAGS@
 PKG_CXXFLAGS = @PKG_CXXFLAGS@
@@ -20,9 +21,10 @@ $(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_NAME="$(TBB_NAME)" \
-	CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"             \
-	CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)"	LDFLAGS="$(LDFLAGS)"         \
+	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)"    \
 	CMAKE="$(CMAKE)" "@R@" -s -f install.libs.R --args build
 
 # NOTE: we do not want to clean ../inst/lib or ../inst/libs here,

tools/config/configure.R

@@ -107,7 +107,6 @@ switch(
 # on Windows, check for Rtools; if it exists, and we have tbb, use it
 if (.Platform$OS.type == "windows") {
 
-   tbbPattern <- "lib(tbb[^[:alpha:]]*)\\.a$"
    gccPath <- normalizePath(Sys.which("gcc"), winslash = "/")
 
    tbbLib <- Sys.getenv("TBB_LIB", unset = NA)
@@ -118,22 +117,35 @@ if (.Platform$OS.type == "windows") {
    if (is.na(tbbInc))
       tbbInc <- normalizePath(file.path(gccPath, "../../include"), winslash = "/")
 
-   tbbLibs <- list.files(tbbLib, pattern = tbbPattern)
-   if (length(tbbLibs)) {
-      tbbName <- gsub(tbbPattern, "\\1", tbbLibs[[1L]])
+   tbbFiles <- list.files(tbbLib, pattern = "^libtbb")
+   if (length(tbbFiles)) {
+      
+      tbbPattern <- "^lib(tbb\\d*(?:_static)?)\\.a$"
+      tbbName <- grep(tbbPattern, tbbFiles, perl = TRUE, value = TRUE)
+      tbbName <- gsub(tbbPattern, "\\1", tbbName, perl = TRUE)
+      
+      tbbMallocPattern <- "^lib(tbbmalloc\\d*(?:_static)?)\\.a$"
+      tbbMallocName <- grep(tbbMallocPattern, tbbFiles, perl = TRUE, value = TRUE)
+      tbbMallocName <- gsub(tbbMallocPattern, "\\1", tbbMallocName, perl = TRUE)
+      
       Sys.setenv(
          TBB_LIB = tbbLib,
          TBB_INC = tbbInc,
-         TBB_NAME = tbbName
+         TBB_NAME = tbbName,
+         TBB_MALLOC_NAME = tbbMallocName
       )
+      
    }
+   
 }
 
 # try and figure out path to TBB
 tbbRoot  <- Sys.getenv("TBB_ROOT", unset = NA)
 tbbLib   <- Sys.getenv("TBB_LIB", unset = NA)
 tbbInc   <- Sys.getenv("TBB_INC", unset = NA)
+
 tbbName  <- Sys.getenv("TBB_NAME", unset = "tbb")
+tbbMallocName <- Sys.getenv("TBB_MALLOC_NAME", unset = "tbbmalloc")
 
 # check TBB_ROOT first if defined
 if (!is.na(tbbRoot)) {
@@ -205,9 +217,10 @@ if (tryAutoDetect) {
 
 # now, define TBB_LIB and TBB_INC as appropriate
 define(
-   TBB_LIB   = if (!is.na(tbbLib)) tbbLib else "",
-   TBB_INC   = if (!is.na(tbbInc)) tbbInc else "",
-   TBB_NAME  = tbbName
+   TBB_LIB         = if (!is.na(tbbLib)) tbbLib else "",
+   TBB_INC         = if (!is.na(tbbInc)) tbbInc else "",
+   TBB_NAME        = tbbName,
+   TBB_MALLOC_NAME = tbbMallocName
 )
 
 # set PKG_LIBS
@@ -217,7 +230,7 @@ pkgLibs <- if (!is.na(tbbLib)) {
       "-Wl,-L\"$(TBB_LIB)\"",
       sprintf("-Wl,-rpath,%s", shQuote(tbbLib)),
       "-l$(TBB_NAME)",
-      "-ltbbmalloc"
+      "-l$(TBB_MALLOC_NAME)"
    )
 
 } else if (.Platform$OS.type == "windows") {
@@ -229,7 +242,7 @@ pkgLibs <- if (!is.na(tbbLib)) {
    c(
       "-Wl,-Ltbb/build/lib_release",
       "-l$(TBB_NAME)",
-      "-ltbbmalloc"
+      "-l$(TBB_MALLOC_NAME)"
    )
 
 }