postgres.git / summary / log / commit / refs

commit    2f4bc5658a1b6ac1e1fda7ce34cb60ecb935b87a
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Sun Sep 21 23:03:31 2025 +0000
First released in: 16.11, 17.7, REL_18_STABLE (reverted before release)
Reverted by: ed93b291c91f (in 18.0)

    Fix meson build with -Duuid=ossp when using version older than 0.60
    
    The package for the UUID library may be named "uuid" or "ossp-uuid", and
    meson.build has been using a single call of dependency() with multiple
    names, something only supported since meson 0.60.0.
    
    The minimum version of meson supported by Postgres is 0.57.2 on HEAD,
    since f039c2244110, and 0.54 on stable branches down to 16.
    
    Author: Oreo Yang <oreo.yang@hotmail.com>
    Reviewed-by: Nazir Bilal Yavuz <byavuz81@gmail.com>
    Discussion: https://postgr.es/m/OS3P301MB01656E6F91539770682B1E77E711A@OS3P301MB0165.JPNP301.PROD.OUTLOOK.COM
    Backpatch-through: 16


 meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 8fb9bcb0062..5807e373308 100644
--- a/meson.build
+++ b/meson.build
@@ -1465,7 +1465,10 @@ if uuidopt != 'none'
   elif uuidopt == 'ossp'
     # In upstream, the package and library is called just 'uuid', but many
     # distros change it to 'ossp-uuid'.
-    uuid = dependency('ossp-uuid', 'uuid', required: false)
+    uuid = dependency('ossp-uuid', required: false)
+    if not uuid.found()
+      uuid = dependency('uuid', required: false)
+    endif
     uuidfunc = 'uuid_export'
     uuidheader = 'uuid.h'
 


[parent: 0870397ccfbd]