Upgrading to GitLab 12.1.0.

Commit d639eeca authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 2.15.1-2

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

  * src/library/tools/R/install.R: Pass "perl = TRUE" parameter to sub()
    function when defining SHLIB_* macros to work-around an erroneus
    string replacement which causes build failures on arm* architectures
    but make the change conditonal on actually being on arm*. 
    With big thanks to Luca Falavigna for finding this fix. (Closes: #679180)
parent eda8fc1b
r-base (2.15.1-2) unstable; urgency=low
* src/library/tools/R/install.R: Pass "perl = TRUE" parameter to sub()
function when defining SHLIB_* macros to work-around an erroneus
string replacement which causes build failures on arm* architectures
but make the change conditonal on actually being on arm*.
With big thanks to Luca Falavigna for finding this fix. (Closes: #679180)
-- Dirk Eddelbuettel <edd@debian.org> Sat, 14 Jul 2012 09:44:24 -0500
r-base (2.15.1-1) unstable; urgency=low
* New upstream version released this morning
......
......@@ -52,7 +52,11 @@
SHLIB_EXT <- if (WINDOWS) ".dll" else {
## can we do better?
mconf <- file.path(R.home(), paste0("etc", rarch), "Makeconf")
sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE))
if (substr( Sys.info()["machine"], 1, 3) == "arm") { # arm has broken regexps in libc
sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE), perl = TRUE)
} else {
sub(".*= ", "", grep("^SHLIB_EXT", readLines(mconf), value = TRUE))
}
}
options(warn = 1)
......@@ -1597,8 +1601,13 @@
mconf <- readLines(file.path(R.home(),
paste0("etc", Sys.getenv("R_ARCH")),
"Makeconf"))
SHLIB_EXT <- sub(".*= ", "", grep("^SHLIB_EXT", mconf, value = TRUE))
SHLIB_LIBADD <- sub(".*= ", "", grep("^SHLIB_LIBADD", mconf, value = TRUE))
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))
}
MAKE <- Sys.getenv("MAKE")
rarch <- Sys.getenv("R_ARCH")
} else {
......
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