X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=rust-src%2Fbch_bindgen%2Fbuild.rs;h=74497b816f9b3dbac5ebded2e97e206fce4d8184;hb=a3eb6ad8ef34368cbe2da8a39d9749ed6e7cb4e0;hp=fd570dbb11731c88c50dc7cfd3be8af6e7e775e3;hpb=1f8fc31ddc1975a1f2e7c2fa8f7f611eab761680;p=bcachefs-tools-debian

diff --git a/rust-src/bch_bindgen/build.rs b/rust-src/bch_bindgen/build.rs
index fd570db..74497b8 100644
--- a/rust-src/bch_bindgen/build.rs
+++ b/rust-src/bch_bindgen/build.rs
@@ -1,74 +1,101 @@
 fn main() {
-	use std::path::PathBuf;
-	// use std::process::Command;
+    use std::path::PathBuf;
 
-	let out_dir: PathBuf = std::env::var_os("OUT_DIR").expect("ENV Var 'OUT_DIR' Expected").into();
-	let top_dir: PathBuf = std::env::var_os("CARGO_MANIFEST_DIR")
-		.expect("ENV Var 'CARGO_MANIFEST_DIR' Expected")
-		.into();
-	let libbcachefs_inc_dir =
-		std::env::var("LIBBCACHEFS_INCLUDE").unwrap_or_else(|_| top_dir.join("libbcachefs").display().to_string());
-	let libbcachefs_inc_dir = std::path::Path::new(&libbcachefs_inc_dir);
-	println!("{}", libbcachefs_inc_dir.display());
+    let out_dir: PathBuf = std::env::var_os("OUT_DIR")
+        .expect("ENV Var 'OUT_DIR' Expected")
+        .into();
+    let top_dir: PathBuf = std::env::var_os("CARGO_MANIFEST_DIR")
+        .expect("ENV Var 'CARGO_MANIFEST_DIR' Expected")
+        .into();
 
-	println!("cargo:rustc-link-lib=dylib=bcachefs");
-	println!("cargo:rustc-link-search={}", env!("LIBBCACHEFS_LIB"));
+    let libbcachefs_inc_dir = std::path::Path::new("../..");
 
-	let _libbcachefs_dir = top_dir.join("libbcachefs").join("libbcachefs");
-	let bindings = bindgen::builder()
-		.header(top_dir.join("src").join("libbcachefs_wrapper.h").display().to_string())
-		.clang_arg(format!("-I{}", libbcachefs_inc_dir.join("include").display()))
-		.clang_arg(format!("-I{}", libbcachefs_inc_dir.display()))
-		.clang_arg("-DZSTD_STATIC_LINKING_ONLY")
-		.clang_arg("-DNO_BCACHEFS_FS")
-		.clang_arg("-D_GNU_SOURCE")
-		.derive_debug(true)
-		.derive_default(true)
-		.derive_eq(true)
-		.layout_tests(true)
-		.default_enum_style(bindgen::EnumVariation::Rust { non_exhaustive: true })
-		.allowlist_function(".*bch2_.*")
-		// .allowlist_function("bch2_read_super")
-		// .allowlist_function("bch2_sb_field_.*")
-		// .allowlist_function("bch2_super_write")
-		// .allowlist_function("bch2_chacha_encrypt_key")
-		// .allowlist_function("__bch2_super_read")
-		.allowlist_function("bio_.*")
-		.allowlist_function("bch2_super_write_fd")
-		.allowlist_function("derive_passphrase")
-		.allowlist_function("request_key")
-		.allowlist_function("add_key")
-		.allowlist_function("keyctl_search")
-		.blocklist_type("bch_extent_ptr")
-		.blocklist_type("btree_node")
-		.blocklist_type("bch_extent_crc32")
-		.blocklist_type("rhash_lock_head")
-		.blocklist_type("srcu_struct")
-		.allowlist_var("BCH_.*")
-		.allowlist_var("KEY_SPEC_.*")
-		.allowlist_type("bch_kdf_types")
-		.allowlist_type("bch_sb_field_.*")
-		.allowlist_type("bch_encrypted_key")
-		.allowlist_type("nonce")
-		.newtype_enum("bch_kdf_types")
-		.opaque_type("gendisk")
-		.opaque_type("bkey")
-		// .opaque_type("bch_extent_ptr")
-		// .opaque_type("bch_extent_crc32")
-		.opaque_type("open_bucket.*")
-		.generate()
-		.expect("BindGen Generation Failiure: [libbcachefs_wrapper]");
-	bindings
-		.write_to_file(out_dir.join("bcachefs.rs"))
-		.expect("Writing to output file failed for: `bcachefs.rs`");
+    let _libbcachefs_dir = top_dir.join("libbcachefs").join("libbcachefs");
+    let bindings = bindgen::builder()
+        .header(
+            top_dir
+                .join("src")
+                .join("libbcachefs_wrapper.h")
+                .display()
+                .to_string(),
+        )
+        .clang_arg(format!(
+            "-I{}",
+            libbcachefs_inc_dir.join("include").display()
+        ))
+        .clang_arg(format!("-I{}", libbcachefs_inc_dir.display()))
+        .clang_arg("-DZSTD_STATIC_LINKING_ONLY")
+        .clang_arg("-DNO_BCACHEFS_FS")
+        .clang_arg("-D_GNU_SOURCE")
+        .clang_arg("-fkeep-inline-functions")
+        .derive_debug(true)
+        .derive_default(true)
+        .layout_tests(true)
+        .default_enum_style(bindgen::EnumVariation::Rust {
+            non_exhaustive: true,
+        })
+        .allowlist_function(".*bch2_.*")
+        .allowlist_function("bio_.*")
+        .allowlist_function("derive_passphrase")
+        .allowlist_function("request_key")
+        .allowlist_function("add_key")
+        .allowlist_function("keyctl_search")
+        .allowlist_function("match_string")
+        .allowlist_function("printbuf.*")
+        .blocklist_type("bch_extent_ptr")
+        .blocklist_type("btree_node")
+        .blocklist_type("bch_extent_crc32")
+        .blocklist_type("rhash_lock_head")
+        .blocklist_type("srcu_struct")
+        .allowlist_var("BCH_.*")
+        .allowlist_var("KEY_SPEC_.*")
+        .allowlist_var("bch.*")
+        .allowlist_var("__BTREE_ITER.*")
+        .allowlist_var("BTREE_ITER.*")
+        .allowlist_var("POS_MIN")
+        .allowlist_var("POS_MAX")
+        .allowlist_var("SPOS_MAX")
+        .blocklist_item("bch2_bkey_ops")
+        .allowlist_type("bch_kdf_types")
+        .allowlist_type("bch_sb_field_.*")
+        .allowlist_type("bch_encrypted_key")
+        .allowlist_type("nonce")
+        .allowlist_type("bch_errcode")
+        .allowlist_function("bch2_err_str")
+        .newtype_enum("bch_kdf_types")
+        .opaque_type("gendisk")
+        .opaque_type("gc_stripe")
+        .opaque_type("open_bucket.*")
+        .opaque_type("replicas_delta_list")
+        .no_copy("btree_trans")
+        .no_copy("printbuf")
+        .no_partialeq("bkey")
+        .no_partialeq("bpos")
+        .generate_inline_functions(true)
+        .generate()
+        .expect("BindGen Generation Failiure: [libbcachefs_wrapper]");
+    bindings
+        .write_to_file(out_dir.join("bcachefs.rs"))
+        .expect("Writing to output file failed for: `bcachefs.rs`");
 
-	let keyutils = pkg_config::probe_library("libkeyutils").expect("Failed to find keyutils lib");
-	let bindings = bindgen::builder()
-		.header(top_dir.join("src").join("keyutils_wrapper.h").display().to_string())
-		.clang_args(keyutils.include_paths.iter().map(|p| format!("-I{}", p.display())))
-		.generate()
-		.expect("BindGen Generation Failiure: [Keyutils]");
-	bindings
-		.write_to_file(out_dir.join("keyutils.rs"))
-		.expect("Writing to output file failed for: `keyutils.rs`");
+    let keyutils = pkg_config::probe_library("libkeyutils").expect("Failed to find keyutils lib");
+    let bindings = bindgen::builder()
+        .header(
+            top_dir
+                .join("src")
+                .join("keyutils_wrapper.h")
+                .display()
+                .to_string(),
+        )
+        .clang_args(
+            keyutils
+                .include_paths
+                .iter()
+                .map(|p| format!("-I{}", p.display())),
+        )
+        .generate()
+        .expect("BindGen Generation Failiure: [Keyutils]");
+    bindings
+        .write_to_file(out_dir.join("keyutils.rs"))
+        .expect("Writing to output file failed for: `keyutils.rs`");
 }