From c2fd1a3d7b43fc381516c087637ddfb51959dc48 Mon Sep 17 00:00:00 2001 From: edd Date: Thu, 10 Jun 2010 14:54:30 +0000 Subject: [PATCH] also treat doMPI as Rmpi and npRmpi and add --no-test-load git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@316 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- TODO | 2 +- trunk/R/debianpkg.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index 165c7ac..53cd457 100644 --- a/TODO +++ b/TODO @@ -12,6 +12,6 @@ sooner later: - split up dependency structure to support building under different distributions - force'ing to a non-existent alias should fail. - - (rev315) the Rmpi and npRmpi packages fail at the end of R CMD INSTALL because the test load of the package fails (outside of an MPI context) + - (rev315) the Rmpi, npRmpi and doMPI packages fail at the end of R CMD INSTALL because the test load of the package fails (outside of an MPI context) so added a crude hack that when the debian/rules is written, 'extraInstallArgs="--no-test-load"' is added (as I do for Debian's Rmpi package) conceivably we may want to generalise this one day as we do for lintian tests and patches and either look at at directory or a db table diff --git a/trunk/R/debianpkg.R b/trunk/R/debianpkg.R index 8e3f8d8..b9f7d2c 100644 --- a/trunk/R/debianpkg.R +++ b/trunk/R/debianpkg.R @@ -37,7 +37,7 @@ generate_rules <- function(pkg) { ,'include /usr/share/R/debian/r-cran.mk' ,'',sep='\n') ,file=pkg$debfile('rules')) - if (pkg$name %in% c("Rmpi", "npRmpi")) { + if (pkg$name %in% c("Rmpi", "npRmpi", "doMPI")) { cat("extraInstallFlags=\"--no-test-load\"\n", file=pkg$debfile('rules'), append=TRUE) } Sys.chmod(pkg$debfile('rules'),'0700') -- 2.39.2