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

Suppress the deprecation warning from bindgen and bump versions #53

Merged
merged 2 commits into from
Dec 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('sched_ext schedulers', 'c',
version: '0.1.3',
version: '0.1.4',
license: 'GPL-2.0')

if meson.version().version_compare('<1.2')
Expand Down
4 changes: 3 additions & 1 deletion rust/scx_utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "scx_utils"
version = "0.4.0"
version = "0.4.1"
edition = "2021"
authors = ["Tejun Heo <[email protected]>"]
license = "GPL-2.0-only"
Expand All @@ -9,6 +9,8 @@ description = "Utilities for sched_ext schedulers"

[dependencies]
anyhow = "1.0"
# FIXME - We need to allow both 0.68 and 0.69 to accommodate fedora. See the
# comment in BpfBuilder::bindgen_bpf_intf() for details.
bindgen = ">=0.68, <0.70"
glob = "0.3"
lazy_static = "1.4"
Expand Down
8 changes: 8 additions & 0 deletions rust/scx_utils/src/bpf_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,14 @@ impl BpfBuilder {
// Tell cargo to invalidate the built crate whenever the wrapper changes
deps.insert(input.to_string());

// FIXME - bindgen's API changed between 0.68 and 0.69 so that
// `bindgen::CargoCallbacks::new()` should be used instead of
// `bindgen::CargoCallbacks`. Unfortunately, as of Dec 2023, fedora
// is shipping 0.68. To accommodate fedora, allow both 0.68 and 0.69
// of bindgen and suppress deprecation warning. Remove the following
// once fedora can be updated to bindgen >= 0.69.
#[allow(deprecated)]

// The bindgen::Builder is the main entry point to bindgen, and lets
// you build up options for the resulting bindings.
let bindings = bindgen::Builder::default()
Expand Down