NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit2209c70

committed

Avoid unnecessary "touch meson.build" in vpath builds

Ine692727 I added a 'touch meson.build' to configure.ac, to ensureconflicts between in-tree configure based builds and meson builds areautomatically detected. Unfortunately I omitted spaces around the conditionrestricting this to in-tree builds, leading to touch meson.build to also beexecuted in vpath builds. While the only consequence of this buglet is anunnecessary 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.deBackpatch: 16-, where the meson based build was added

1 parenta9155ef commit2209c70Copy full SHA for 2209c70

File tree

2 files changed

-2

lines changed

2 files changed

-2

lines changed

`‎configure`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20827,6 +20827,6 @@ fi`
`20827`	`20827`
`20828`	`20828`	`# Ensure that any meson build directories would reconfigure and see that`
`20829`	`20829`	`# there's a conflicting in-tree build and can error out.`
`20830`		`-if test "$vpath_build"="no"; then`
	`20830`	`+if test "$vpath_build" ="no"; then`
`20831`	`20831`	`touch meson.build`
`20832`	`20832`	`fi`

`‎configure.ac`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2500,6 +2500,6 @@ AC_OUTPUT`
`2500`	`2500`
`2501`	`2501`	`# Ensure that any meson build directories would reconfigure and see that`
`2502`	`2502`	`# there's a conflicting in-tree build and can error out.`
`2503`		`-if test "$vpath_build"="no"; then`
	`2503`	`+if test "$vpath_build" ="no"; then`
`2504`	`2504`	`touch meson.build`
`2505`	`2505`	`fi`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2209c70

File tree

2 files changed

2 files changed

`‎configure`

`‎configure.ac`

0 commit comments