Skip to content
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.

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

only compile library when using recent bpftool versions #1080

Merged
merged 1 commit into from
Dec 9, 2024

Conversation

etsal
Copy link
Contributor

@etsal etsal commented Dec 9, 2024

Some scx users have bpftool versions < 7.5.0, causing Meson system to throw errors when linking in the BPF library to schedulers. Add a workaround by only compiling the library when the bpftool is new enough.

@etsal etsal force-pushed the etsal/no-library-old-bpftool branch from b5f2b93 to a6ea2b4 Compare December 9, 2024 18:30
@etsal etsal force-pushed the etsal/no-library-old-bpftool branch from a6ea2b4 to c5c4cae Compare December 9, 2024 18:32
@etsal etsal marked this pull request as ready for review December 9, 2024 18:49
@etsal etsal added this pull request to the merge queue Dec 9, 2024
output: scx_lib_name + '.bpf.o',
command: [compile_scx_lib, bpftool_exe_path, '@OUTPUT@', scx_lib_name, objs],
depends: objs,
if bpftool_maj < 7 or (bpftool_maj == 7 and bpftool_min >= 5)
Copy link
Contributor

@hodgesds hodgesds Dec 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably worth adding a comment on why this is needed.

Merged via the queue into sched-ext:main with commit ed5d35c Dec 9, 2024
23 checks passed
@etsal etsal deleted the etsal/no-library-old-bpftool branch December 9, 2024 19:13
etsal added a commit to etsal/scx that referenced this pull request Dec 10, 2024
…tool

only compile library when using recent bpftool versions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants