Bug#682267: unblock: r-base/2.15.1-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package r-base.
It contains a workaround to let packages build on armel and armhf
architectures. Give-backs were all successful, so the fix is proven good by
itself :)
unblock r-base/2.15.1-4
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-3-amd64 (SMP w/8 CPU cores)
diff -u r-base-2.15.1/debian/changelog r-base-2.15.1/debian/changelog
--- r-base-2.15.1/debian/changelog
+++ r-base-2.15.1/debian/changelog
@@ -1,3 +1,27 @@
+r-base (2.15.1-4) unstable; urgency=low
+
+ * src/library/tools/R/install.R: Pass "perl = TRUE" parameter to sub()
+ really passing it to sub and not to grep (Closes: #679180)
+
+ -- Dirk Eddelbuettel <edd@debian.org> Sun, 15 Jul 2012 17:56:35 -0500
+
+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()
+ 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
only in patch2:
unchanged:
--- r-base-2.15.1.orig/src/library/tools/R/install.R
+++ r-base-2.15.1/src/library/tools/R/install.R
@@ -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), 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")
} else {
Reply to: