upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-07-15 04:40:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix meson uuid header check so it works with MSVC

Browse source 
The OSSP uuid.h file includes unistd.h, so to use it with MSVC we need to
include the postgres include directories so it picks up our version of
that in src/include/port/win32_msvc. Adjust the meson test accordingly.

Backported from commit 7c655a04a2, so we can build release 16 with UUID

per request from Marina Polyakova
This commit is contained in:
Andrew Dunstan 2024-05-26 17:34:45 -04:00
parent 766b0b40aa
commit 1250adfdf0
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
meson.build
View file

@ -1463,7 +1463,10 @@ if uuidopt != 'none'
error('unknown uuid build option value: @0@'.format(uuidopt))
endif
if not cc.has_header_symbol(uuidheader, uuidfunc, args: test_c_args, dependencies: uuid)
if not cc.has_header_symbol(uuidheader, uuidfunc,
args: test_c_args,
include_directories: postgres_inc,
dependencies: uuid)
error('uuid library @0@ missing required function @1@'.format(uuidopt, uuidfunc))
endif
cdata.set('HAVE_@0@'.format(uuidheader.underscorify().to_upper()), 1)