Repository navigation
Commit 62d2dd8
authored
### Rationale
The R build may pick up a system-installed simdjson when `simdjson_SOURCE` is not explicitly set. This causes build failures in environments where the system version is incompatible or unsuitable for the build.
### What changes are included?
This change defaults `simdjson_SOURCE` to `BUNDLED` when it is not already set, ensuring C++ wrapper builds invoked through `build_arrow_static.sh` use the bundled simdjson by default, while still allowing users to override it explicitly.
This addresses the macOS CRAN release and ubuntu-r-only-r (AUTO deps) failures reported in GH-50581.
Related: #50581
* GitHub Issue: #50581
Authored-by: Aaditya Srinivasan <[email protected]>
Signed-off-by: Rok Mihevc <[email protected]>
1 parent 6efe7b3 commit 62d2dd8
4 files changed
Lines changed: 20 additions & 5 deletions
File tree
- cpp
- cmake_modules
- src/arrow
- r/inst
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
101 | | - | |
102 | | - | |
| 101 | + | |
| 102 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
410 | 410 | | |
411 | 411 | | |
412 | 412 | | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
413 | 422 | | |
414 | 423 | | |
415 | 424 | | |
| |||
2827 | 2836 | | |
2828 | 2837 | | |
2829 | 2838 | | |
2830 | | - | |
| 2839 | + | |
2831 | 2840 | | |
2832 | 2841 | | |
2833 | 2842 | | |
| |||
2844 | 2853 | | |
2845 | 2854 | | |
2846 | 2855 | | |
| 2856 | + | |
| 2857 | + | |
| 2858 | + | |
| 2859 | + | |
| 2860 | + | |
2847 | 2861 | | |
2848 | 2862 | | |
2849 | 2863 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1044 | 1044 | | |
1045 | 1045 | | |
1046 | 1046 | | |
1047 | | - | |
| 1047 | + | |
1048 | 1048 | | |
1049 | 1049 | | |
1050 | 1050 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | | - | |
111 | 110 | | |
| 111 | + | |
| 112 | + | |
112 | 113 | | |
113 | 114 | | |
114 | 115 | | |
| |||
0 commit comments