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

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

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

5
meson.build
View File

@@ -1579,10 +1579,7 @@ 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', required: false) uuid = dependency('ossp-uuid', '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'