Merge pull request #1154 from dave-tucker/fix-codegen

chore(codegen): Fix duplicate BPF_F_LINK

xtask/src/codegen/aya.rs

@@ -216,6 +216,10 @@ fn codegen_bindings(opts: &SysrootOptions, libbpf_dir: &Path) -> Result<(), anyh
         for x in &vars {
             bindgen = bindgen
                 .allowlist_var(x)
+                // BPF_F_LINK is defined twice. Once in an anonymous enum
+                // which bindgen will constify, and once via #define macro
+                // which generates a duplicate const.
+                .blocklist_var("BPF_F_LINK")
                 .constified_enum("BPF_F_.*")
                 .constified_enum("BTF_KIND_.*")
                 .constified_enum("BTF_VAR_.*")

xtask/src/codegen/aya_ebpf_bindings.rs

@@ -36,6 +36,10 @@ pub fn codegen(opts: &SysrootOptions, libbpf_dir: &Path) -> Result<(), anyhow::E
             .clang_args(&["-I", &*libbpf_dir.join("include/uapi").to_string_lossy()])
             .clang_args(&["-I", &*libbpf_dir.join("include").to_string_lossy()])
             .clang_args(&["-I", &*libbpf_dir.join("src").to_string_lossy()])
+            // BPF_F_LINK is defined twice. Once in an anonymous enum
+            // which bindgen will constify, and once via #define macro
+            // which generates a duplicate const.
+            .blocklist_var("BPF_F_LINK")
             // open aya-ebpf-bindings/.../bindings.rs and look for mod
             // _bindgen, those are anonymous enums
             .constified_enum("BPF_F_.*")