Skip to content

Commit 15662e6

Browse files
authored
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 <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent e54ac19 commit 15662e6

File tree

3 files changed

+30
-10
lines changed

3 files changed

+30
-10
lines changed

cpp/src/arrow/meson.build

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,10 @@ if needs_csv
293293
endif
294294

295295
if needs_json or needs_integration
296-
rapidjson_dep = dependency('rapidjson', include_type: 'system')
296+
rapidjson_dep = dependency(
297+
'RapidJSON',
298+
fallback: ['rapidjson', 'rapidjson_dep'],
299+
)
297300
else
298301
rapidjson_dep = disabler()
299302
endif
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
project('rapidjson', 'cpp')
19+
20+
rapidjson_dep = declare_dependency(include_directories: 'include')

cpp/subprojects/rapidjson.wrap

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,12 @@
1616
# under the License.
1717

1818
[wrap-file]
19-
directory = rapidjson-1.1.0
20-
source_url = https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz
21-
source_filename = rapidjson-1.1.0.tar.gz
22-
source_hash = bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
23-
patch_filename = rapidjson_1.1.0-2_patch.zip
24-
patch_url = https://wrapdb.mesonbuild.com/v2/rapidjson_1.1.0-2/get_patch
25-
patch_hash = c1480d0ecef09dbaa4b4d85d86090205386fb2c7e87f4f158b20dbbda14c9afc
26-
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/rapidjson_1.1.0-2/rapidjson-1.1.0.tar.gz
27-
wrapdb_version = 1.1.0-2
19+
directory = rapidjson-232389d4f1012dddec4ef84861face2d2ba85709
20+
source_url = https://github.com/Tencent/rapidjson/archive/232389d4f1012dddec4ef84861face2d2ba85709.tar.gz
21+
source_filename = rapidjson-232389d4f1012dddec4ef84861face2d2ba85709.tar.gz
22+
source_hash = b9290a9a6d444c8e049bd589ab804e0ccf2b05dc5984a19ed5ae75d090064806
23+
source_fallback_url = https://apache.jfrog.io/artifactory/arrow/thirdparty/7.0.0/rapidjson-232389d4f1012dddec4ef84861face2d2ba85709.tar.gz
24+
patch_directory = rapidjson
2825

2926
[provide]
3027
rapidjson = rapidjson_dep

0 commit comments

Comments
 (0)