Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6d4bc96

Browse files
committed
Avoid unnecessary "touch meson.build" in vpath builds
In e692727 I added a 'touch meson.build' to configure.ac, to ensure conflicts between in-tree configure based builds and meson builds are automatically detected. Unfortunately I omitted spaces around the condition restricting this to in-tree builds, leading to touch meson.build to also be executed in vpath builds. While the only consequence of this buglet is an unnecessary empty file in build directories, it seems worth backpatching. Reported-by: Christoph Berg <myon@debian.org> Discussion: https://postgr.es/m/20240417230002.mb2gv3hyetyn67gk@awork3.anarazel.de Backpatch: 16-, where the meson based build was added
1 parent bb7f195 commit 6d4bc96

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -20644,6 +20644,6 @@ fi
2064420644

2064520645
# Ensure that any meson build directories would reconfigure and see that
2064620646
# there's a conflicting in-tree build and can error out.
20647-
if test "$vpath_build"="no"; then
20647+
if test "$vpath_build" = "no"; then
2064820648
touch meson.build
2064920649
fi

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -2533,6 +2533,6 @@ AC_OUTPUT
25332533

25342534
# Ensure that any meson build directories would reconfigure and see that
25352535
# there's a conflicting in-tree build and can error out.
2536-
if test "$vpath_build"="no"; then
2536+
if test "$vpath_build" = "no"; then
25372537
touch meson.build
25382538
fi

0 commit comments

Comments
 (0)