ARROW-13610: [R] Unvendor cpp11

Closes #11360 from jonkeane/ARROW-13610-unvendor-cpp11 Authored-by: Jonathan Keane <[email protected]> Signed-off-by: Jonathan Keane <[email protected]>
apache · Jan 7, 2022 · 8139cdd · 8139cdd
1 parent 7943664
commit 8139cdd
Show file tree

Hide file tree

Showing 29 changed files with 13 additions and 3,766 deletions.
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
@@ -324,6 +324,14 @@ jobs:
           cd r/tests
           sed -i.bak -E -e 's/"arrow"/"arrow", reporter = "location"/' testthat.R
           rm -f testthat.R.bak
+      - name: Install cpp11 (on R 3.6)
+      # Since we force installation of binary packages below, dependency versions
+      # are frozen for old versions of R. We need newer cpp11 than is available as
+      # "binary" (though it doesn't matter because the cpp11 R package is just a 
+      # vehicle for the header-only C++ code.
+        if: ${{ matrix.rtools == 35 }}
+        shell: Rscript {0}
+        run: install.packages("cpp11", type = "source")
       - name: Install R package dependencies
         shell: Rscript {0}
         run: |

diff --git a/ci/conda_env_r.txt b/ci/conda_env_r.txt
@@ -21,8 +21,7 @@ r-bit64
 r-dplyr
 r-purrr
 r-r6
-# We are currently vendoring cpp11; restore in ARROW-13610
-# r-cpp11
+r-cpp11
 r-rlang
 r-tidyselect
 r-vctrs

diff --git a/dev/tasks/conda-recipes/r-arrow/configure.win b/dev/tasks/conda-recipes/r-arrow/configure.win
@@ -2,8 +2,7 @@
 
 set -euxo pipefail
 
-# Remove the -I../inst/include/ when unvendoring cpp11 in ARROW-13610
-echo "PKG_CPPFLAGS=-DNDEBUG -I\"${LIBRARY_PREFIX}/include\" -I\"${PREFIX}/include\" -DARROW_R_WITH_ARROW -DARROW_R_WITH_PARQUET -DARROW_R_WITH_DATASET -DARROW_R_WITH_S3 -DARROW_R_WITH_JSON -I../inst/include/" > src/Makevars.win
+echo "PKG_CPPFLAGS=-DNDEBUG -I\"${LIBRARY_PREFIX}/include\" -I\"${PREFIX}/include\" -DARROW_R_WITH_ARROW -DARROW_R_WITH_PARQUET -DARROW_R_WITH_DATASET -DARROW_R_WITH_S3 -DARROW_R_WITH_JSON" > src/Makevars.win
 echo "PKG_CXXFLAGS=\$(CXX_VISIBILITY)" >> src/Makevars.win
 echo 'CXX_STD=CXX11' >> src/Makevars.win
 echo "PKG_LIBS=-L\"${LIBRARY_PREFIX}/lib\" -larrow_dataset -lparquet -larrow" >> src/Makevars.win
diff --git a/r/DESCRIPTION b/r/DESCRIPTION
@@ -59,6 +59,7 @@ Suggests:
     testthat (>= 3.1.0),
     tibble,
     withr
+LinkingTo: cpp11 (>= 0.4.2)
 Collate:
     'arrowExports.R'
     'enums.R'

diff --git a/r/inst/include/cpp11.hpp b/r/inst/include/cpp11.hpp
diff --git a/r/inst/include/cpp11/R.hpp b/r/inst/include/cpp11/R.hpp
diff --git a/r/inst/include/cpp11/altrep.hpp b/r/inst/include/cpp11/altrep.hpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,7 @@ r-bit64 @@
     r-dplyr
     r-purrr
     r-r6
-    # We are currently vendoring cpp11; restore in ARROW-13610
-    # r-cpp11
+    r-cpp11
     r-rlang
     r-tidyselect
     r-vctrs
@@ Expand Down @@