You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2025/08/15 21:51:49 UTC
(arrow) branch main updated: GH-47039: [C++] Bump RapidJSON dependency in Meson configuration (#47041)
This is an automated email from the ASF dual-hosted git repository.
kou 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 15662e67ba GH-47039: [C++] Bump RapidJSON dependency in Meson configuration (#47041)
15662e67ba is described below
commit 15662e67ba8742af3fdb12c48712752d578992e1
Author: William Ayd <wi...@icloud.com>
AuthorDate: Fri Aug 15 17:51:43 2025 -0400
GH-47039: [C++] Bump RapidJSON dependency in Meson configuration (#47041)
### Rationale for this change
The Meson configuration is unusable on gcc 14.2 given issues with the RapidJSON release of 1.1.0 (released in 2016)
### What changes are included in this PR?
Bumps the RapidJSON version to a commit hash that matches what is used in CMake by default
### Are these changes tested?
Yes
### Are there any user-facing changes?
No
* GitHub Issue: #47039
Authored-by: Will Ayd <wi...@icloud.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
cpp/src/arrow/meson.build | 5 ++++-
.../rapidjson/meson.build} | 14 ++------------
cpp/subprojects/rapidjson.wrap | 15 ++++++---------
3 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/cpp/src/arrow/meson.build b/cpp/src/arrow/meson.build
index f19bd7a1be..c7490a8e88 100644
--- a/cpp/src/arrow/meson.build
+++ b/cpp/src/arrow/meson.build
@@ -293,7 +293,10 @@ if needs_csv
endif
if needs_json or needs_integration
- rapidjson_dep = dependency('rapidjson', include_type: 'system')
+ rapidjson_dep = dependency(
+ 'RapidJSON',
+ fallback: ['rapidjson', 'rapidjson_dep'],
+ )
else
rapidjson_dep = disabler()
endif
diff --git a/cpp/subprojects/rapidjson.wrap b/cpp/subprojects/packagefiles/rapidjson/meson.build
similarity index 56%
copy from cpp/subprojects/rapidjson.wrap
copy to cpp/subprojects/packagefiles/rapidjson/meson.build
index 8295f19852..a407ed7901 100644
--- a/cpp/subprojects/rapidjson.wrap
+++ b/cpp/subprojects/packagefiles/rapidjson/meson.build
@@ -15,16 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-[wrap-file]
-directory = rapidjson-1.1.0
-source_url = https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz
-source_filename = rapidjson-1.1.0.tar.gz
-source_hash = bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
-patch_filename = rapidjson_1.1.0-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/rapidjson_1.1.0-2/get_patch
-patch_hash = c1480d0ecef09dbaa4b4d85d86090205386fb2c7e87f4f158b20dbbda14c9afc
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/rapidjson_1.1.0-2/rapidjson-1.1.0.tar.gz
-wrapdb_version = 1.1.0-2
+project('rapidjson', 'cpp')
-[provide]
-rapidjson = rapidjson_dep
+rapidjson_dep = declare_dependency(include_directories: 'include')
diff --git a/cpp/subprojects/rapidjson.wrap b/cpp/subprojects/rapidjson.wrap
index 8295f19852..d48fd999ba 100644
--- a/cpp/subprojects/rapidjson.wrap
+++ b/cpp/subprojects/rapidjson.wrap
@@ -16,15 +16,12 @@
# under the License.
[wrap-file]
-directory = rapidjson-1.1.0
-source_url = https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz
-source_filename = rapidjson-1.1.0.tar.gz
-source_hash = bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
-patch_filename = rapidjson_1.1.0-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/rapidjson_1.1.0-2/get_patch
-patch_hash = c1480d0ecef09dbaa4b4d85d86090205386fb2c7e87f4f158b20dbbda14c9afc
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/rapidjson_1.1.0-2/rapidjson-1.1.0.tar.gz
-wrapdb_version = 1.1.0-2
+directory = rapidjson-232389d4f1012dddec4ef84861face2d2ba85709
+source_url = https://github.com/Tencent/rapidjson/archive/232389d4f1012dddec4ef84861face2d2ba85709.tar.gz
+source_filename = rapidjson-232389d4f1012dddec4ef84861face2d2ba85709.tar.gz
+source_hash = b9290a9a6d444c8e049bd589ab804e0ccf2b05dc5984a19ed5ae75d090064806
+source_fallback_url = https://apache.jfrog.io/artifactory/arrow/thirdparty/7.0.0/rapidjson-232389d4f1012dddec4ef84861face2d2ba85709.tar.gz
+patch_directory = rapidjson
[provide]
rapidjson = rapidjson_dep