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

Commit3a797c2

Browse files
committed
oauth: Fix kqueue detection on OpenBSD
Inb0635bf, I added an early header check to the Meson OAuth support,which was intended to duplicate the later checks forHAVE_SYS_[EVENT|EPOLL]_H. However, I implemented the new test viacheck_header() -- which tries to compile -- rather than has_header(),which just looks for the file's existence.The distinction matters on OpenBSD, where <sys/event.h> can't becompiled without including prerequisite headers, so -Dlibcurl=enabledfailed on that platform. Switch to has_header() to fix this.Note that reviewers expressed concern about the difference between ourAutoconf feature tests (which compile headers) and our Meson featuretests (which do not). I'm not opposed to aligning the two, but I want toavoid making bigger changes as part of this fix.Reviewed-by: Peter Eisentraut <peter@eisentraut.org>Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://postgr.es/m/flat/CAOYmi+kdR218ke2zu74oTJvzYJcqV1MN5=mGAPqZQuc79HMSVA@mail.gmail.comBackpatch-through: 18
1 parent440c5ee commit3a797c2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

‎meson.build‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -943,10 +943,10 @@ if not libcurlopt.disabled()
943943
# libcurl and one of either epoll or kqueue.
944944
oauth_flow_supported= (
945945
libcurl.found()
946-
and (cc.check_header('sys/event.h',required:false,
947-
args: test_c_args,include_directories: postgres_inc)
948-
or cc.check_header('sys/epoll.h',required:false,
949-
args: test_c_args,include_directories: postgres_inc))
946+
and (cc.has_header('sys/event.h',
947+
args: test_c_args,include_directories: postgres_inc)
948+
or cc.has_header('sys/epoll.h',
949+
args: test_c_args,include_directories: postgres_inc))
950950
)
951951

952952
if oauth_flow_supported

0 commit comments

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