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

Commited93b29

Browse files
committed
Revert "Fix meson build with -Duuid=ossp when using version older than 0.60"
This reverts commit5f565b0 temporarily on v18. This branch is ina release freeze state until tagged. Let's re-add this commit once therelease is out. The other branches are left untouched.Discussion:https://postgr.es/m/2775358.1758498584@sss.pgh.pa.us
1 parent5f565b0 commited93b29

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

‎meson.build‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,10 +1579,7 @@ if uuidopt != 'none'
15791579
elif uuidopt=='ossp'
15801580
# In upstream, the package and library is called just 'uuid', but many
15811581
# distros change it to 'ossp-uuid'.
1582-
uuid=dependency('ossp-uuid',required:false)
1583-
ifnot uuid.found()
1584-
uuid=dependency('uuid',required:false)
1585-
endif
1582+
uuid=dependency('ossp-uuid','uuid',required:false)
15861583
uuidfunc='uuid_export'
15871584
uuidheader='uuid.h'
15881585

0 commit comments

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