Revert "Fix meson build with -Duuid=ossp when using version older than 0.60"

michaelpq · michaelpq · commit ed93b291c91f · 2025-09-22T09:04:20.000+09:00
This reverts commit 5f565b0 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
diff --git 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'
 
