JakeHillion/scx
1
0
Fork 0
mirror of https://github.com/JakeHillion/scx.git synced 2024-12-03 22:37:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #53 from sched-ext/htejun

Browse Source 
Suppress the deprecation warning from bindgen and bump versions
This commit is contained in:
Tejun Heo 2023-12-29 07:07:06 +09:00 committed by GitHub
commit d2a173fc51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -1,5 +1,5 @@
project('sched_ext schedulers', 'c', project('sched_ext schedulers', 'c',
version: '0.1.3', version: '0.1.4',
license: 'GPL-2.0') license: 'GPL-2.0')
if meson.version().version_compare('<1.2') if meson.version().version_compare('<1.2')

4
rust/scx_utils/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "scx_utils" name = "scx_utils"
version = "0.4.0" version = "0.4.1"
edition = "2021" edition = "2021"
authors = ["Tejun Heo <tj@kernel.org>"] authors = ["Tejun Heo <tj@kernel.org>"]
license = "GPL-2.0-only" license = "GPL-2.0-only"
@ -9,6 +9,8 @@ description = "Utilities for sched_ext schedulers"
[dependencies] [dependencies]
anyhow = "1.0" 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" bindgen = ">=0.68, <0.70"
glob = "0.3" glob = "0.3"
lazy_static = "1.4" lazy_static = "1.4"

8
rust/scx_utils/src/bpf_builder.rs
View File

@ -493,6 +493,14 @@ impl BpfBuilder {
// Tell cargo to invalidate the built crate whenever the wrapper changes // Tell cargo to invalidate the built crate whenever the wrapper changes
deps.insert(input.to_string()); 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 // The bindgen::Builder is the main entry point to bindgen, and lets
// you build up options for the resulting bindings. // you build up options for the resulting bindings.
let bindings = bindgen::Builder::default() let bindings = bindgen::Builder::default()