git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb7f195)
Avoid unnecessary "touch meson.build" in vpath builds
2024年4月25日 14:51:33 +0000 (07:51 -0700)
2024年4月25日 14:51:33 +0000 (07:51 -0700)
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


diff --git a/configure b/configure
index cfbd2a096f4d29f516413a5b15d2a52edd68ff3d..89644f2249e86ae66f68e54c307351bb9c144bc4 100755 (executable)
--- 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 67e738d92b1cca54ce51f6ea56b926d210f4f020..c7322e292cc6ed54bc985b78bc54c16d6dd226fb 100644 (file)
--- 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
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /