[PATCH 01/12] meson.build: remove -DCURL_DISABLE_TYPECHECK

Ramsay Jones· Mar 15, 2025, 02:46 UTC · lore

Commit 9371322a60 ("sparse: suppress some \"using sizeof on a function\" warnings", 2013-10-06) used target-specific variable assignments to add -DCURL_DISABLE_TYPECHECK to SPARSE_FLAGS for each of the files affected by the "typecheck-gcc.h" warnings. (http-push.c, http.c, http-walker.c and remote-curl.c).

These warnings are only issued by sparse, and not by gcc, so we do not want to disable the 'type checking' for non-sparse targets. The meson build does not provide any sparse targets, so there is no need to use the CURL_DISABLE_TYPECHECK preprocessor flag with the c compiler.

In order to re-enable the curl 'type checking' in the meson build, remove the assignment of -DCURL_DISABLE_TYPECHECK to libgit_c_args.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
 meson.build | 1 -
 1 file changed, 1 deletion(-)

Show changes to meson.build +0 −1

diff --git a/meson.build b/meson.build
index efe2871c9d..88a29fd043 100644
--- a/meson.build
+++ b/meson.build
@@ -966,7 +966,6 @@ if curl.found()
   # Most executables don't have to link against libcurl, but we still need its
   # include directories so that we can resolve LIBCURL_VERSION in "help.c".
   libgit_dependencies += curl.partial_dependency(includes: true)
-  libgit_c_args += '-DCURL_DISABLE_TYPECHECK'
   build_options_config.set('NO_CURL', '')
 else
   libgit_c_args += '-DNO_CURL'

-- 
2.49.0

Patrick Steinhardt· Mar 19, 2025, 13:36 UTC · re: Ramsay Jones · lore

Re: [PATCH 01/12] meson.build: remove -DCURL_DISABLE_TYPECHECK

On Sat, Mar 15, 2025 at 02:46:23AM +0000, Ramsay Jones wrote:

Show 16 quoted lines

> 
> Commit 9371322a60 ("sparse: suppress some \"using sizeof on a function\"
> warnings", 2013-10-06) used target-specific variable assignments to add
> -DCURL_DISABLE_TYPECHECK to SPARSE_FLAGS for each of the files affected
> by the "typecheck-gcc.h" warnings. (http-push.c, http.c, http-walker.c
> and remote-curl.c).
> 
> These warnings are only issued by sparse, and not by gcc, so we do not
> want to disable the 'type checking' for non-sparse targets. The meson
> build does not provide any sparse targets, so there is no need to use
> the CURL_DISABLE_TYPECHECK preprocessor flag with the c compiler.
> 
> In order to re-enable the curl 'type checking' in the meson build, remove
> the assignment of -DCURL_DISABLE_TYPECHECK to libgit_c_args.
> 
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>

Makes sense indeed.

Patrick

patch, 12 partsmeson.build: remove -DCURL_DISABLE_TYPECHECK