From 178bbf403cc51d912b50f8ad8ea318e42cc29f42 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 22 Sep 2025 08:03:25 +0900 Subject: [PATCH] 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 Reviewed-by: Nazir Bilal Yavuz 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 363bd7a9a18..d19de28dfce 100644 --- a/meson.build +++ b/meson.build @@ -1579,7 +1579,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' -- 2.47.3