Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
gaborcsardi committed Aug 1, 2024
1 parent fbe342f commit 9e67449
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cran.r-project.org/web/checks/check_flavors.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="container">
<h2>CRAN Package Check Flavors</h2>
<p>
Last updated on 2024-07-31 04:48:37 CEST.
Last updated on 2024-08-01 04:53:06 CEST.
</p>
<p>
Systems used for CRAN package checking.
Expand Down
2 changes: 1 addition & 1 deletion cran.r-project.org/web/checks/check_issue_kinds.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="container">
<h2>CRAN Package Check Issue Kinds</h2>
<p>
Last updated on 2024-07-31 04:48:37 CEST.
Last updated on 2024-08-01 04:53:06 CEST.
</p>
<table border="1">
<tr> <th> Kind </th> <th> Description </th> <th> Details </th> </tr>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## KH's personal ~/.R/check.Renviron.
## Last updated on 2024-04-01
## Last updated on 2024-07-20

### Defaults for '--as-cran": commented out where not appropriate for
### all KH checks.
Expand Down Expand Up @@ -66,6 +66,7 @@ _R_CHECK_VC_DIRS_=true
_R_CHECK_VIGNETTE_TITLES_=true
## _R_CHECK_XREFS_PKGS_ARE_DECLARED_=true
## _R_CHECK_XREFS_MIND_SUSPECT_ANCHORS_=true
_R_CHECK_XREFS_NOTE_MISSING_PACKAGE_ANCHORS_=true
_R_SHLIB_BUILD_OBJECTS_SYMBOL_TABLES_=true

### Additional settings used for all KH checks.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ case "${R_flavor}" in
esac

check_flavor="${R_flavor}-${suffix}"
export _CHECK_CRAN_REGULAR_FLAVOR_=${check_flavor}

case ${FQDN} in
gimli*.wu.ac.at)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ usage <- function() {
" -c run CRAN incoming feasibility checks",
" -r also check strong reverse depends",
" -r=WHICH also check WHICH reverse depends",
" -r~PKGLIST also check revdeps in PKGLIST",
" -N=N use N CPUs",
" -f=FLAVOR use flavor FLAVOR ('g' or 'c' for the GCC or Clang",
" defaults, 'g/v' or 'c/v' for the version 'v' ones)",
Expand Down Expand Up @@ -149,6 +150,10 @@ if(any(ind <- startsWith(args, "-r="))) {
}
args <- args[!ind]
}
if(any(ind <- startsWith(args, "-r~"))) {
reverse <- unlist(strsplit(substring(args[ind][1L], 4L), ", *"))
args <- args[!ind]
}
if(any(ind <- startsWith(args, "-N="))) {
Ncpus <- list(which = substring(args[ind][1L], 4L))
args <- args[!ind]
Expand Down Expand Up @@ -235,6 +240,7 @@ check_env <-
"_R_CHECK_UNDOC_USE_ALL_NAMES_=true",
"_R_CHECK_URLS_SHOW_301_STATUS_=true",
## "_R_CHECK_XREFS_MIND_SUSPECT_ANCHORS_=true",
## "_R_CHECK_XREFS_NOTE_MISSING_PACKAGE_ANCHORS_=true",
"_R_CXX_USE_NO_REMAP_=true",
character()),
c(check_env_common,
Expand Down Expand Up @@ -267,7 +273,7 @@ check_env <-
character())
)

if(!is.null(reverse))
if(!is.null(reverse) && !is.character(reverse))
reverse$repos <- getOption("repos")["CRAN"]

pfiles <-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ env_session_time_limits <- character()
## c("R_SESSION_TIME_LIMIT_CPU=600",
## "R_SESSION_TIME_LIMIT_ELAPSED=1800")
## </FIXME>
flavor <- Sys.getenv("_CHECK_CRAN_REGULAR_FLAVOR_")

xvfb_run <- "xvfb-run -a --server-args=\"-screen 0 1280x1024x24\""

Expand Down Expand Up @@ -78,6 +79,10 @@ Sys.setenv("_R_CHECK_INSTALL_DEPENDS_" = "true")
## Currently not needed as we parallize via Make.
## </NOTE>

## <FIXME>
Sys.setenv("ARROW_WITH_LZ4" = "OFF")
## </FIXME>

wrkdir <- getwd()

if(!interactive()) {
Expand Down Expand Up @@ -228,7 +233,7 @@ function(pnames, available, libdir, Ncpus = 1)
available[rpnames, "Path"] <- rpfiles
}

cmd0 <- sprintf("/usr/bin/env MAKEFLAGS= R_LIBS_USER=%s %s %s %s %s CMD INSTALL --pkglock --build",
cmd0 <- sprintf("/usr/bin/env MAKEFLAGS= R_LIBS_USER=%s %s %s %s %s CMD INSTALL --pkglock",
shQuote(libdir),
paste(env_session_time_limits, collapse = " "),
xvfb_run,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ GCC 14.1.0 (C, C++, Fortran)
Timezone Europe/London
Locale en_GB.UTF-8, LC_COLLATE=C

[2024-08-01: testing GCC 14.2 RC2, which reports 14.1.1 20240729.]]

configured with options --enable-lto=R, config.site:

CFLAGS="-g -O2 -Wall -pedantic -mtune=native -Werror=format-security -Wp,-D_FORTIFY_SOURCE=3 -fexceptions -fstack-protector-strong -fstack-clash-protection -fcf-protection -Werror=implicit-function-declaration -Wstrict-prototypes"
Expand Down

0 comments on commit 9e67449

Please sign in to comment.