Include symbols from static libraries used in PKG_LIBS in symbols.rds (PR#18789).

git-svn-id: https://svn.r-project.org/R/trunk@87984 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: hornik

share/make/shlib.mk

@@ -22,7 +22,7 @@ shlib-clean:
 ## FIXME: why not Rscript?
 symbols.rds: $(OBJECTS)
 	@$(ECHO) "tools:::.shlib_objects_symbol_tables()" | \
-	  $(R_HOME)/bin/R --vanilla --no-echo --args $(OBJECTS)
+	  $(R_HOME)/bin/R --vanilla --no-echo --args $(OBJECTS) --pkglibs $(PKG_LIBS)
 
 compilers:
 	@$(ECHO) "CC = $(CC)"

src/library/tools/R/sotools.R

@@ -1048,7 +1048,36 @@ function(x, ...)
 .shlib_objects_symbol_tables <-
 function(file = "symbols.rds")
 {
-    objects <- commandArgs(trailingOnly = TRUE)
+    args <- commandArgs(trailingOnly = TRUE)
+    ## <FIXME WINDOWS>
+    if(.Platform$OS.type != "windows") {
+        pos <- which(args == "--pkglibs")[1L]
+        objects <- args[seq_len(pos - 1L)]
+        pkglibs <- args[-seq_len(pos)]
+    } else {
+        objects <- args
+        pkglibs <- character()
+    }
+    ## </FIXME>
+    ## Also determine the local static libraries linked against by
+    ## following the approach suggested in section "Compiling in
+    ## sub-directories" of WRE.
+    if(length(pkglibs)) {
+        files <- list.files("..", recursive = TRUE, pattern = "[.]a$",
+                            full.names = TRUE)
+        if(any(ind <- startsWith(files, "../src/")))
+            files[ind] <- substring(files[ind], 8L)
+        ## Case A: local static libs given via their path.
+        libpaths <- pkglibs[file.exists(pkglibs)]
+        ## Case B: local static libs given as '-lfoo'.
+        libnames <- pkglibs[startsWith(pkglibs, "-l")]
+        libnames <- sprintf("lib%s.a", substring(libnames, 3L))
+        objects <- c(objects,
+                     files[normalizePath(files) %in%
+                           normalizePath(libpaths)],
+                     files[basename(files) %in% libnames])
+        objects <- unique(objects)
+    }
     tables <- lapply(objects, read_symbols_from_object_file)
     names(tables) <- objects
     saveRDS(tables, file = file, version = 2)