postgres.git / summary / log / commit / refs

commit    ed93b291c91fb2fe2e5c57913cc0dbff72fc0f08
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Mon Sep 22 00:04:20 2025 +0000
First released in: 18.0

    Revert "Fix meson build with -Duuid=ossp when using version older than 0.60"
    
    This reverts commit 5f565b0aee90 temporarily on v18.  This branch is in
    a release freeze state until tagged.  Let's re-add this commit once the
    release is out.  The other branches are left untouched.
    
    Discussion: https://postgr.es/m/2775358.1758498584@sss.pgh.pa.us


 meson.build | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index a15686cc4e3..973e8890bbd 100644
--- a/meson.build
+++ b/meson.build
@@ -1579,10 +1579,7 @@ 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', required: false)
-    if not uuid.found()
-      uuid = dependency('uuid', required: false)
-    endif
+    uuid = dependency('ossp-uuid', 'uuid', required: false)
     uuidfunc = 'uuid_export'
     uuidheader = 'uuid.h'
 


[parent: 5f565b0aee90]