From ce72f0e37be75a40e2af2ca1cc420f719bae4a93 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 26 May 2021 19:10:17 +0200 Subject: [PATCH] meson: Drop curl workaround It appears to no longer be necessary. Signed-off-by: Andrea Bolognani Reviewed-by: Pavel Hrdina --- meson.build | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/meson.build b/meson.build index a29e53af77..c514fd6d06 100644 --- a/meson.build +++ b/meson.build @@ -904,16 +904,6 @@ endif curl_version = '7.19.1' curl_dep = dependency('libcurl', version: '>=' + curl_version, required: get_option('curl')) if curl_dep.found() - # XXX as of libcurl-devel-7.20.1-3.fc13.x86_64, curl ships a version - # of that #defines several wrapper macros around underlying - # functions to add type safety for gcc only. However, these macros - # spuriously trip gcc's -Wlogical-op warning. Avoid the warning by - # disabling the wrappers; even if it removes some type-check safety. - curl_dep = declare_dependency( - compile_args: [ '-DCURL_DISABLE_TYPECHECK' ], - dependencies: [ curl_dep ], - ) - conf.set('WITH_CURL', 1) endif