Adding option for static linking and updating wrapper for arm64 architecture

Author: tryggvil

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "libnfs-sys"
 description = "libnfs bindings allow you to create nfs mounts in memory/userspace"
-version = "0.2.3"
+version = "0.2.4"
 authors = ["Chris Holcombe <[email protected]>"]
 homepage = "https://github.com/cholcombe973/libnfs-sys"
 repository = "https://github.com/cholcombe973/libnfs-sys"
@@ -11,7 +11,10 @@ readme = "README.md"
 keywords = ["nfs"]
 categories = ["api-bindings", "network-programming", "filesystem", "external-ffi-bindings"]
 
+[lib]
+crate-type = ["rlib"]
+
 [build-dependencies]
-bindgen = "0.69.4"
+bindgen = "~0.70.1"
 
 [dependencies]

build.rs

@@ -1,11 +1,30 @@
 extern crate bindgen;
 
 use std::env;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 fn main() {
-    println!("cargo:rustc-link-lib=nfs");
-
+    let link_static_env_if_any = env::var("LIBNFS_LINK_STATIC");
+    match link_static_env_if_any {
+        Ok(link_static) => {
+            if link_static == "true" {
+                println!("cargo:rustc-link-lib=static=nfs");
+            } else {
+                println!("cargo:rustc-link-lib=nfs"); 
+            }
+        },
+        Err(_) => {
+            println!("cargo:rustc-link-lib=nfs");
+        },
+    }
+    let libnfs_lib_path_if_any = env::var("LIBNFS_LIB_PATH");
+    match libnfs_lib_path_if_any {
+        Ok(lib_dir) => {
+            let lib_dir = Path::new(&lib_dir);
+            println!("cargo:rustc-link-search=native={}", lib_dir.display());
+        },
+        Err(_) => {},
+    }
     // The bindgen::Builder is the main entry point
     // to bindgen, and lets you build up options for
     // the resulting bindings.

wrapper.h

@@ -1,3 +1,6 @@
+#if defined(__aarch64__) && !defined(__arm64__)
+#define __arm64__ 1
+#endif
 #include <sys/statvfs.h>
 #include <sys/time.h>
 #include <nfsc/libnfs.h>