From ede4a11b6fd17cb665a4c0746a7dee5ea9ef1558 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Mon, 30 Sep 2024 11:22:36 -0400 Subject: [PATCH] Fixes for CRAN. --- .github/workflows/main.yml | 5 +++++ src/mlpack/bindings/R/mlpack/DESCRIPTION.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8802612a0..c7d1fc2b32 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,10 +64,15 @@ jobs: sudo apt-get install -y --allow-unauthenticated libopenblas-dev liblapack-dev g++ libensmallen-dev libhdf5-dev libarmadillo-dev libcurl4-openssl-dev wget https://github.com/USCiLab/cereal/archive/refs/tags/v1.3.2.tar.gz tar -xvzpf v1.3.2.tar.gz + # # These directives cause warnings on CRAN: # https://github.com/USCiLab/cereal/blob/master/include/cereal/external/base64.hpp#L28-L31 # The command below comments them out. sed -i 's|#pragma|// #pragma|' cereal-1.3.2/include/cereal/external/base64.hpp + # + # Fix cereal compilation on clang 19+; see + # https://github.com/USCiLab/cereal/pull/835 + sed -i 's|::template apply|::apply|' cereal-1.3.2/include/cereal/types/tuple.hpp - name: Install R-bindings dependencies run: | diff --git a/src/mlpack/bindings/R/mlpack/DESCRIPTION.in b/src/mlpack/bindings/R/mlpack/DESCRIPTION.in index 998a1f6df8..b35295e17f 100644 --- a/src/mlpack/bindings/R/mlpack/DESCRIPTION.in +++ b/src/mlpack/bindings/R/mlpack/DESCRIPTION.in @@ -15,7 +15,7 @@ LinkingTo: Rcpp, RcppArmadillo (>= @RcppArmadillo_Version@), RcppEnsmallen (>= @RcppEnsmallen_Version@) Suggests: testthat (>= 2.1.0) -URL: https://www.mlpack.org/doc/mlpack-@PACKAGE_DOC_VERSION@/r_documentation.html, +URL: https://www.mlpack.org/doc/user/bindings/r.html, https://github.com/mlpack/mlpack BugReports: https://github.com/mlpack/mlpack/issues RoxygenNote: 7.1.0