postgres.git / summary / log / commit / refs

commit    6d4bc96eb77bca6277880f218cd7a2f9e44bddc0
Author:   Andres Freund <andres@anarazel.de>
Date:     Thu Apr 25 14:51:33 2024 +0000
First released in: 17.0, 16.3

    Avoid unnecessary "touch meson.build" in vpath builds
    
    In e6927270cd1 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


 configure    | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index cfbd2a096f4..89644f2249e 100755
--- a/configure
+++ b/configure
@@ -20644,6 +20644,6 @@ fi
 
 # Ensure that any meson build directories would reconfigure and see that
 # there's a conflicting in-tree build and can error out.
-if test "$vpath_build"="no"; then
+if test "$vpath_build" = "no"; then
   touch meson.build
 fi
diff --git a/configure.ac b/configure.ac
index 67e738d92b1..c7322e292cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2533,6 +2533,6 @@ AC_OUTPUT
 
 # Ensure that any meson build directories would reconfigure and see that
 # there's a conflicting in-tree build and can error out.
-if test "$vpath_build"="no"; then
+if test "$vpath_build" = "no"; then
   touch meson.build
 fi


[parent: bb7f195ff788]