From: Andrew Dunstan <andrew@dunslane.net>
Date: Sun, 26 May 2024 21:34:45 +0000 (-0400)
Subject: Fix meson uuid header check so it works with MSVC
X-Git-Tag: REL_16_7~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1250adfdf07da7eb6e1f629d7ffafd8372e0ad6d;p=thirdparty%2Fpostgresql.git

Fix meson uuid header check so it works with MSVC

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
---

diff --git a/meson.build b/meson.build
index 8ea42dea81f..4e59feb91da 100644
--- a/meson.build
+++ b/meson.build
@@ -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)