You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by as...@apache.org on 2024/01/08 23:38:00 UTC

(arrow) branch main updated: MINOR: [R] Default to bundled re2 build (#39514)

This is an automated email from the ASF dual-hosted git repository.

assignuser pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new f60c281809 MINOR: [R] Default to bundled re2 build (#39514)
f60c281809 is described below

commit f60c2818092a407eddfaaacadac775a14e0d28d1
Author: Jacob Wujciak-Jens <ja...@wujciak.de>
AuthorDate: Tue Jan 9 00:37:54 2024 +0100

    MINOR: [R] Default to bundled re2 build (#39514)
    
    ### Rationale for this change
    
    The CRAN check on `fedora clang devel` builds with clang against libc++ and has a system re2 installed that was build with C++11  ABI which causes  linking to fail  due to the [abi:cxx11]-symbol annotation on the system version.
    
    A user could manually use the bundled build or path hint a clang version of the library. To avoid extra work for the CRAN maintainers we can just default to the bundled build. The re2 build is small enough that users building from source will not really feel the difference and can still opt to use the system re2 via `EXTRA_CMAKE_FLAGS`.
    
    ### What changes are included in this PR?
    
    Default to use our bundled build to prevent the problems.
    
    ### Are these changes tested?
    
    On a local dev container replicating the cran env.
    
    ### Are there any user-facing changes?
    
    Source build now default to use the bundled re2 version, this can be overridden.
    
    Authored-by: Jacob Wujciak-Jens <ja...@wujciak.de>
    Signed-off-by: Jacob Wujciak-Jens <ja...@wujciak.de>
---
 r/inst/build_arrow_static.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/r/inst/build_arrow_static.sh b/r/inst/build_arrow_static.sh
index 52ac5b7d32..9c9fadea47 100755
--- a/r/inst/build_arrow_static.sh
+++ b/r/inst/build_arrow_static.sh
@@ -97,6 +97,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
     -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON \
     -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON \
     -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
+    -Dre2_SOURCE=${re2_SOURCE:-BUNDLED} \
     -Dxsimd_SOURCE=${xsimd_SOURCE:-} \
     -Dzstd_SOURCE=${zstd_SOURCE:-} \
     ${EXTRA_CMAKE_FLAGS} \