From 4a00c0635146844396aad1c44c9e338f2cf3a3f8 Mon Sep 17 00:00:00 2001 From: Yaroslav Chvanov Date: Sun, 5 Mar 2023 16:53:01 +0300 Subject: [PATCH] build: remove Coverity work-around Coverity hasn't been used in a long while, by their web-site [1], last analyzing was done in 2019-02 - over 4 years ago. --- meson.build | 19 ------------------- meson_options.txt | 5 ----- 2 files changed, 24 deletions(-) diff --git a/meson.build b/meson.build index 2c6d461e..b5e821c1 100644 --- a/meson.build +++ b/meson.build @@ -58,25 +58,6 @@ libratbag_data_dir = join_paths(get_option('prefix'), libratbag_data_dir_devel = join_paths(project_source_root, 'data', 'devices') config_h.set_quoted('LIBRATBAG_DATA_DIR', libratbag_data_dir) -# Coverity breaks because it doesn't define _Float128 correctly, you'll end -# up with a bunch of messages in the form: -# "/usr/include/stdlib.h", line 133: error #20: identifier "_Float128" is -# undefined -# extern _Float128 strtof128 (const char *__restrict __nptr, -# ^ -# We don't use float128 ourselves, it gets pulled in from math.h or -# something, so let's just define it as uint128 and move on. -# Unfortunately we can't detect the coverity build at meson configure -# time, we only know it fails at runtime. So make this an option instead, to -# be removed when coverity fixes this again. -if get_option('coverity') - config_h.set('_Float128', '__uint128_t') - config_h.set('_Float32', 'int') - config_h.set('_Float32x', 'int') - config_h.set('_Float64', 'long') - config_h.set('_Float64x', 'long') -endif - # dependencies pkgconfig = import('pkgconfig') dep_udev = dependency('libudev') diff --git a/meson_options.txt b/meson_options.txt index 9297c35c..5b32331b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -38,8 +38,3 @@ option('logind-provider', choices: [ 'elogind', 'systemd'], value : 'systemd', description : 'Which logind provider to use') - -option('coverity', - type: 'boolean', - value: false, - description: 'Enable coverity build fixes, see meson.build for details [default=false]')