Movatterモバイル変換


[0]ホーム

URL:


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

Sign up
Appearance settings

Commit6ff385f

Browse files
committed
Meson: check for pg_config_paths.h left over from make
The meson build scripts attempt to find files left over from configureand fail, mentioning that "make maintainer-clean" should be run to removethese. This seems to have been done for files generated from configure.pg_config_paths.h is generated during the actual make build, so seems tohave been missed. This would result in compilation using the wrongpg_config_paths.h file.Here we just add this file to generated_sources_ac so that meson errorsout if pg_config_paths.h exists.Likely this wasn't noticed before because make maintainer-clean willremove pg_config_paths.h, however, people using the MSVC build scriptsare more likely to run into issues and they have to manually removethese files and pg_config_paths.h wasn't listed as a conflicting file toremove in the meson log.Backpatch-through: 16, where meson support was addedDiscussion:https://postgr.es/m/CAApHDvqjYOxZfmLKAOWKFEE7LOr9_E6UA6YNmx9r8nxStcS3gg@mail.gmail.com
1 parenta28166d commit6ff385f

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

‎src/port/meson.build

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,3 +195,6 @@ endforeach
195195
pgport_srv= pgport['_srv']
196196
pgport_static= pgport['']
197197
pgport_shlib= pgport['_shlib']
198+
199+
# autoconf generates the file there, ensure we get a conflict
200+
generated_sources_ac+= {'src/port': ['pg_config_paths.h']}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp