Skip to content

meson: do not export private header into uapi dep file #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fvalette merged 1 commit into from
Feb 4, 2026
Merged

meson: do not export private header into uapi dep file #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ endforeach

external_deps = []

global_build_args = [
'-include', fs.parent(kconfig_h) / fs.name(kconfig_h),
exported_global_build_args = [
'-ffreestanding',
'-fno-builtin',
'-nostdlib',
Expand All @@ -121,6 +120,13 @@ global_build_args = [
activated_hardening_cflags,
]

# kconfig generated header is private header and must not be exported through
# meson dependency nor pkg-config file.
global_build_args = [
'-include', fs.parent(kconfig_h) / fs.name(kconfig_h),
exported_global_build_args,
]

# Deprecated kconfig entry handling, to be removed on next major release
if kconfig_data.has('CONFIG_TASK_MAGIC_VALUE')
warning('Deprecated kconfig entry CONFIG_TASK_MAGIC_VALUE, please update config file')
Expand Down
4 changes: 2 additions & 2 deletions uapi/src/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ uapi_rlib = static_library(
sentry_c_uapi_dep = declare_dependency(
link_with: uapi_lib,
sources: [ uapi_h ],
compile_args: [ global_build_args, target_arch_args ],
compile_args: [ exported_global_build_args, target_arch_args ],
include_directories: [ userspace_uapi_include_dir ],
)

Expand All @@ -52,5 +52,5 @@ pkg_config = import('pkgconfig')
pkg_config.generate(
uapi_lib,
filebase: 'uapi',
extra_cflags: [ global_build_args, target_arch_args ],
extra_cflags: [ exported_global_build_args, target_arch_args ],
)
Loading