Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit aa11a9c

Browse filesBrowse files
committed
meson: Stop using deprecated way getting path of files
The just released meson 1.3 strongly deprecated a hack we were using, emitting a noisy warning (the hack basically depended on an implementation detail to work). Turns out there has been a better way available for a while, I just hadn't found it. 1.4 added a more convenient approach, but we can't rely on that. Reviewed-by: Tristan Partin <tristan@neon.tech> Discussion: https://postgr.es/m/20231129185053.s6c7f73eg7b4ztfi@awork3.anarazel.de Backpatch: 16-, where the meson build was added.
1 parent 3b51265 commit aa11a9c
Copy full SHA for aa11a9c

File tree

Expand file treeCollapse file tree

1 file changed

+6
-2
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+6
-2
lines changed

‎meson.build

Copy file name to clipboardExpand all lines: meson.build
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2924,8 +2924,12 @@ potentially_conflicting_files = []
29242924
foreach t : potentially_conflicting_files_t
29252925
potentially_conflicting_files += t.full_path()
29262926
endforeach
2927-
foreach t : configure_files
2928-
t = '@0@'.format(t)
2927+
foreach t1 : configure_files
2928+
if meson.version().version_compare('>=0.59')
2929+
t = fs.parent(t1) / fs.name(t1)
2930+
else
2931+
t = '@0@'.format(t1)
2932+
endif
29292933
potentially_conflicting_files += meson.current_build_dir() / t
29302934
endforeach
29312935
foreach sub, fnames : generated_sources_ac

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.