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

Commitcc90d78

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 parent441eba3 commitcc90d78

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
@@ -1423,16 +1423,16 @@ if uuidopt != 'none'
14231423
uuidfunc='uuid_to_string'
14241424
uuidheader='uuid.h'
14251425
elif uuidopt=='ossp'
1426-
uuid=dependency('ossp-uuid',required:false)
1426+
# In upstream, the package and library is called just 'uuid', but many
1427+
# distros change it to 'ossp-uuid'.
1428+
uuid=dependency('ossp-uuid','uuid',required:false)
14271429
uuidfunc='uuid_export'
14281430
uuidheader='uuid.h'
14291431

14301432
# Hardcoded lookup for ossp-uuid. This is necessary as ossp-uuid on
14311433
# windows installs neither a pkg-config nor a cmake dependency
14321434
# information. Nor is there another supported uuid implementation
14331435
# available on windows.
1434-
#
1435-
# Sometimes the ossp-uuid library is named 'uuid' sometimes 'ossp-uuid'
14361436
ifnot uuid.found()
14371437
uuid= cc.find_library('ossp-uuid',
14381438
required:false,dirs: test_lib_d,

0 commit comments

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