Refactor dependency handling for lib32 packages
- Updated the `CrossConfig` to change the generator name from `nyapm` to `depot`. - Introduced a new `RequestedOutputs` enum to manage different output types for dependencies. - Refactored dependency collection functions to support lib32-specific dependencies. - Enhanced the `check_build_deps`, `check_runtime_deps`, and `check_test_deps` functions to accept output types. - Modified the `print_dep_status` function to handle output-specific dependency statuses. - Added support for lib32 dependencies in the `PackageSpec` struct and related methods. - Updated the `source_deps_for_install` function to conditionally include lib32 dependencies. - Implemented tests to verify the correct handling of lib32 dependencies and their overrides. - Adjusted legacy hook collection to support lib32-prefixed scripts.
This commit is contained in:
@@ -690,6 +690,7 @@ pub fn create_interactive() -> Result<PackageSpec> {
|
||||
runtime: runtime_deps,
|
||||
test: test_deps,
|
||||
optional: optional_deps,
|
||||
lib32: None,
|
||||
},
|
||||
package_alternatives: Default::default(),
|
||||
package_dependencies: Default::default(),
|
||||
@@ -1776,6 +1777,7 @@ mod tests {
|
||||
runtime: vec![],
|
||||
test: vec!["python".into(), "bats".into()],
|
||||
optional: vec!["gtk-doc".into()],
|
||||
lib32: None,
|
||||
},
|
||||
package_alternatives: Default::default(),
|
||||
package_dependencies: Default::default(),
|
||||
@@ -1884,6 +1886,7 @@ mod tests {
|
||||
runtime: vec!["foo".into(), "bar".into()],
|
||||
test: Vec::new(),
|
||||
optional: Vec::new(),
|
||||
lib32: None,
|
||||
},
|
||||
package_alternatives: Default::default(),
|
||||
package_dependencies: Default::default(),
|
||||
|
||||
Reference in New Issue
Block a user