Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit469b97c

Browse files
committed
Fallback to uuid for ossp-uuid with meson
The upstream name for the ossp-uuid package / pkg-config file is"uuid". Many distributions change this to be "ossp-uuid" to notconflict with e2fsprogs.This lookup fails on distributions which don't change this name, forexample NixOS / nixpkgs. Both "ossp-uuid" and "uuid" are also checkedin configure.ac.Author: Wolfgang WaltherReviewed-by: Nazir Bilal Yavuz, Alvaro Herrera, Peter EisentrautReviewed-by: Tristan PartinDiscussion:https://www.postgresql.org/message-id/ca8f37e1-a2c3-40e2-91f6-59c3d3652ad4@technowledgy.deBackpatch: 16-, where meson support was added
1 parente367a41 commit469b97c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

‎meson.build‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,16 +1416,16 @@ if uuidopt != 'none'
14161416
uuidfunc='uuid_to_string'
14171417
uuidheader='uuid.h'
14181418
elif uuidopt=='ossp'
1419-
uuid=dependency('ossp-uuid',required:false)
1419+
# In upstream, the package and library is called just 'uuid', but many
1420+
# distros change it to 'ossp-uuid'.
1421+
uuid=dependency('ossp-uuid','uuid',required:false)
14201422
uuidfunc='uuid_export'
14211423
uuidheader='uuid.h'
14221424

14231425
# Hardcoded lookup for ossp-uuid. This is necessary as ossp-uuid on
14241426
# windows installs neither a pkg-config nor a cmake dependency
14251427
# information. Nor is there another supported uuid implementation
14261428
# available on windows.
1427-
#
1428-
# Sometimes the ossp-uuid library is named 'uuid' sometimes 'ossp-uuid'
14291429
ifnot uuid.found()
14301430
uuid= cc.find_library('ossp-uuid',
14311431
required:false,dirs: test_lib_d,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp