temp: review changes

Author: eerii

binary/Cargo.toml

@@ -2,7 +2,6 @@
 name = "system-deps-binary"
 version = "0.1.0"
 edition = "2021"
-links = "system-deps-binary"
 
 [build-dependencies]
 system-deps-meta = { path = "../meta" }

binary/build.rs

@@ -115,7 +115,7 @@ fn paths() -> HashMap<String, Vec<PathBuf>> {
     let mut follow_list = HashMap::new();
 
     // Global overrides from environment
-    // TODO: This need to come first
+    // TODO: Change this so the env set global url always is first in the list of paths
     if let Some(url) = env("SYSTEM_DEPS_BINARY_URL") {
         let checksum = env("SYSTEM_DEPS_BINARY_CHECKSUM");
         let pkg_paths = env("SYSTEM_DEPS_BINARY_PKG_PATHS");

meta/build.rs

@@ -50,7 +50,7 @@ fn find_by_path(mut dir: PathBuf) -> Option<PathBuf> {
 /// Get the manifest from the project directory. This is **not** the directory
 /// where `system-deps` is cloned, it should point to the top level `Cargo.toml`
 /// file. This is needed to obtain metadata from all of dependencies, including
-/// those upstream of the package being compiled.
+/// those downstream of the package being compiled.
 ///
 /// If the target directory is not a subfolder of the project it will not be
 /// possible to detect it automatically. In this case, the user will be asked

meta/src/lib.rs

@@ -40,6 +40,8 @@ fn check_cfg(lit: &str) -> Option<bool> {
 
 /// Inserts values from b into a only if they don't already exist.
 /// TODO: This function could be a lot cleaner and it needs better error handling.
+///       The logic for merging values needs to handle more cases so during testing this will have to be rewritten.
+///       Additionally, make sure that only downstream crates can override the metadata.
 fn merge(a: &mut Value, b: Value) {
     match (a, b) {
         (a @ &mut Value::Object(_), Value::Object(b)) => {
@@ -66,7 +68,7 @@ fn merge(a: &mut Value, b: Value) {
 }
 
 /// Recursively read dependency manifests to find metadata matching a key.
-/// The matching metadata is aggregated in a list, with upstream crates having priority
+/// The matching metadata is aggregated in a list, with downstream crates having priority
 /// for overwriting values. It will only read from the metadata sections matching the
 /// provided key.
 ///

src/lib.rs

@@ -934,9 +934,10 @@ impl Config {
             combined_pkg_config_path.extend_from_slice(&pkg_config_path);
 
             // should the lib be statically linked?
-            let statik = self
-                .env
-                .has_value(&EnvVariable::new_link(Some(name)), "static")
+            let statik = cfg!(feature = "binary")
+                || self
+                    .env
+                    .has_value(&EnvVariable::new_link(Some(name)), "static")
                 || self.env.has_value(&EnvVariable::new_link(None), "static");
 
             let mut library = if self.env.contains(&EnvVariable::new_no_pkg_config(name)) {