Commit c6bb9776 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.15.1-3

r-base (2.15.1-3) unstable; urgency=low

  * src/library/tools/R/install.R: Pass "perl = TRUE" parameter to sub()
    and correcting error in logic of patch used in -2.	(Closes: #679180)
parent d639eeca
r-base (2.15.1-3) unstable; urgency=low
* src/library/tools/R/install.R: Pass "perl = TRUE" parameter to sub()
and correcting error in logic of patch used in -2. (Closes: #679180)
-- Dirk Eddelbuettel <edd@debian.org> Sun, 15 Jul 2012 16:17:25 -0500
r-base (2.15.1-2) unstable; urgency=low
* src/library/tools/R/install.R: Pass "perl = TRUE" parameter to sub()
......
......@@ -1602,11 +1602,11 @@
paste0("etc", Sys.getenv("R_ARCH")),
"Makeconf"))
if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc
SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE))
SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE))
} else {
SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE, perl = TRUE))
SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE, perl = TRUE))
} else {
SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE))
SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE))
}
MAKE <- Sys.getenv("MAKE")
rarch <- Sys.getenv("R_ARCH")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment