Skip to content

Attempt to fix R universe build fail #53 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gregorgorjanc merged 1 commit into from
Feb 1, 2026
Merged

Attempt to fix R universe build fail #53 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions RcppTskit/R/RcppExports.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}.
Expand All @@ -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}.
Expand Down Expand Up @@ -110,3 +110,4 @@ test_tsk_trace_error_c <- function() {
test_tsk_trace_error_cpp <- function() {
invisible(.Call(`_RcppTskit_test_tsk_trace_error_cpp`))
}

4 changes: 2 additions & 2 deletions RcppTskit/man/kastore_version.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions RcppTskit/man/tskit_version.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions RcppTskit/src/Makevars.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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@
Loading