database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-27 00:12:01 +03:00
Code Activity

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

Browse Source 
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 f039c22441, 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
This commit is contained in:
Michael Paquier
2025-09-22 08:03:25 +09:00
parent b585f25284
commit 5f565b0aee
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@@ -1579,7 +1579,10 @@ if uuidopt != 'none'
elif uuidopt == 'ossp' elif uuidopt == 'ossp'
# In upstream, the package and library is called just 'uuid', but many # In upstream, the package and library is called just 'uuid', but many
# distros change it to 'ossp-uuid'. # 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' uuidfunc = 'uuid_export'
uuidheader = 'uuid.h' uuidheader = 'uuid.h'