NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7274009

committed

meson: fix openssl detection issues in 6a30027

When not detecting openssl via pkg-config, we'd error out if the headersweren't found, even if -Dssl=auto. When detecting via pkg-config, but theheaders could not be found, we'd error out because the ssl_int variable wouldnot exist.Reported-by: Nathan Bossart <nathandbossart@gmail.com>Discussion:https://postgr.es/m/20230313180432.GA246741@nathanxps13

1 parent25a7812 commit7274009Copy full SHA for 7274009

File tree

1 file changed

+12

-6

lines changed

meson.build

1 file changed

+12

-6

lines changed

`‎meson.build`

Lines changed: 12 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1189,23 +1189,29 @@ if sslopt in ['auto', 'openssl']`
`1189`	`1189`
`1190`	`1190`	`# via pkg-config et al`
`1191`	`1191`	`ssl=dependency('openssl',required:false)`
	`1192`	`+# only meson >= 0.57 supports declare_dependency() in cc.has_function(), so`
	`1193`	`+# we pass cc.find_library() results if necessary`
	`1194`	`+ ssl_int= []`
`1192`	`1195`
`1193`	`1196`	`# via library + headers`
`1194`	`1197`	`ifnot ssl.found()`
`1195`	`1198`	`ssl_lib= cc.find_library('ssl',`
`1196`	`1199`	`dirs: test_lib_d,`
`1197`	`1200`	`header_include_directories: postgres_inc,`
`1198`		`-has_headers: ['openssl/ssl.h','openssl/err.h'])`
	`1201`	`+has_headers: ['openssl/ssl.h','openssl/err.h'],`
	`1202`	`+required: openssl_required)`
`1199`	`1203`	`crypto_lib= cc.find_library('crypto',`
`1200`	`1204`	`dirs: test_lib_d,`
`1201`		`-header_include_directories: postgres_inc)`
`1202`		`-ssl_int= [ssl_lib,crypto_lib]`
`1203`		`-`
`1204`		`- ssl=declare_dependency(dependencies: ssl_int,`
`1205`		`-include_directories: postgres_inc)`
	`1205`	`+required: openssl_required)`
	`1206`	`+ifssl_lib.found()andcrypto_lib.found()`
	`1207`	`+ ssl_int= [ssl_lib, crypto_lib]`
	`1208`	`+ssl=declare_dependency(dependencies: ssl_int,include_directories: postgres_inc)`
	`1209`	`+endif`
`1206`	`1210`	`elif cc.has_header('openssl/ssl.h',args: test_c_args,dependencies: ssl,required: openssl_required)and \`
`1207`	`1211`	`cc.has_header('openssl/err.h',args: test_c_args,dependencies: ssl,required: openssl_required)`
`1208`	`1212`	`ssl_int= [ssl]`
	`1213`	`+else`
	`1214`	`+ ssl= not_found_dep`
`1209`	`1215`	`endif`
`1210`	`1216`
`1211`	`1217`	`if ssl.found()`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7274009

File tree

1 file changed

1 file changed

`‎meson.build`

0 commit comments