diff options
| author | David Rowley <drowley@postgresql.org> | 2023-08-24 10:33:53 +1200 |
|---|---|---|
| committer | David Rowley <drowley@postgresql.org> | 2023-08-24 10:33:53 +1200 |
| commit | 6ff385f20c4ed2af707d523ceb2bea694668c123 (patch) | |
| tree | 1c2ef91768792aa1bf2f7636ab69b26bf46c558b /src | |
| parent | a28166df8c5a00ec3d9b3550a4f6598593ebf873 (diff) | |
| download | postgresql-6ff385f20c4ed2af707d523ceb2bea694668c123.tar.gz postgresql-6ff385f20c4ed2af707d523ceb2bea694668c123.zip | |
Meson: check for pg_config_paths.h left over from make
The meson build scripts attempt to find files left over from configure
and fail, mentioning that "make maintainer-clean" should be run to remove
these. This seems to have been done for files generated from configure.
pg_config_paths.h is generated during the actual make build, so seems to
have been missed. This would result in compilation using the wrong
pg_config_paths.h file.
Here we just add this file to generated_sources_ac so that meson errors
out if pg_config_paths.h exists.
Likely this wasn't noticed before because make maintainer-clean will
remove pg_config_paths.h, however, people using the MSVC build scripts
are more likely to run into issues and they have to manually remove
these files and pg_config_paths.h wasn't listed as a conflicting file to
remove in the meson log.
Backpatch-through: 16, where meson support was added
Discussion: https://postgr.es/m/CAApHDvqjYOxZfmLKAOWKFEE7LOr9_E6UA6YNmx9r8nxStcS3gg@mail.gmail.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/port/meson.build | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/port/meson.build b/src/port/meson.build index deb354418db..a0d0a9583a0 100644 --- a/src/port/meson.build +++ b/src/port/meson.build @@ -195,3 +195,6 @@ endforeach pgport_srv = pgport['_srv'] pgport_static = pgport[''] pgport_shlib = pgport['_shlib'] + +# autoconf generates the file there, ensure we get a conflict +generated_sources_ac += {'src/port': ['pg_config_paths.h']} |