WIP for R universe build fail #53

Author: gregorgorjanc

RcppTskit/R/RcppExports.R

@@ -1,7 +1,7 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
-#' @title Report the version of the installed kastore C API
+#' @title Report the version of installed kastore C API
 #' @details The version is stored in the installed header \code{kastore.h}.
 #' @return A named vector with three elements \code{major}, \code{minor}, and
 #'   \code{patch}.
@@ -12,7 +12,7 @@ kastore_version <- function() {
     .Call(`_RcppTskit_kastore_version`)
 }
 
-#' @title Report the version of the installed tskit C API
+#' @title Report the version of installed tskit C API
 #' @details The version is defined in the installed header \code{tskit/core.h}.
 #' @return A named vector with three elements \code{major}, \code{minor}, and
 #'   \code{patch}.
@@ -110,3 +110,4 @@ test_tsk_trace_error_c <- function() {
 test_tsk_trace_error_cpp <- function() {
     invisible(.Call(`_RcppTskit_test_tsk_trace_error_cpp`))
 }
+

RcppTskit/man/kastore_version.Rd

@@ -32,12 +32,12 @@ OBJECTS = $(TSKIT_OBJECTS) $(RCPPTSKIT_OBJECTS)
 
 # Include paths and preprocessor defines
 # * A bit complicated include/tskit structure due to how we include tskit headers
-# * $(R_HOME)/include is for <R_ext/Error.h>
+# * $(R_INCLUDE_DIR) is for <R_ext/Error.h>
 PKG_CPPFLAGS = \
 	-I../inst/include \
 	-I../inst/include/tskit \
 	-I../inst/include/tskit/tskit \
-	-I$(R_HOME)/include
+	-I$(R_INCLUDE_DIR)
 
 # Compiler flags
 PKG_CFLAGS = -DNDEBUG # to remove calls to assert() as per the R extensions manual
@@ -46,7 +46,7 @@ PKG_CFLAGS = -DNDEBUG # to remove calls to assert() as per the R extensions manu
 
 # Explicit compile rule for tskit C files
 tskit/%.o: tskit/%.c
-	$(CC) $(PKG_CPPFLAGS) $(PKG_CFLAGS) $(CFLAGS) $(CPICFLAGS) -c $< -o $@
+	$(CC) $(ALL_CPPFLAGS) $(PKG_CFLAGS) $(CFLAGS) $(CPICFLAGS) -c $< -o $@
 
 # Linking
 PKG_LIBS = @RCPPTSKIT_LIB@