From f88b1b9fda817f4e937c9f5fdee26a4ea5b3e212 Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Wed, 2 Oct 2024 23:50:43 +0200 Subject: [PATCH] Remove CXX11 --- .github/workflows/R-CMD-check.yaml | 4 ++-- src/Makevars | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index b339829..0c0f8c1 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -17,8 +17,8 @@ jobs: matrix: config: - {os: macOS-latest, r: 'release'} - - {os: windows-latest, r: '3.6'} - {os: windows-latest, r: '4.1'} + - {os: windows-latest, r: '4.2'} - {os: windows-latest, r: 'release'} - {os: windows-latest, r: 'devel'} - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} @@ -30,7 +30,7 @@ jobs: R_KEEP_PKG_SOURCE: yes steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-pandoc@v2 diff --git a/src/Makevars b/src/Makevars index 8a3cf47..7072f0f 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,5 +1,4 @@ # Upstream requires C++98 but we patched so it builds with C++11 -CXX_STD=CXX11 PKG_LIBS=-Llibcld2 -lstatcld2 # Compiles 'libcld2' as shown in src/internal/compile_libs.sh