cargo: Add support for target specific dependencies

Author: xclaesse

mesonbuild/cargo/interpreter.py

@@ -20,9 +20,8 @@
 import itertools
 import typing as T
 
-from . import builder
-from . import version
-from ..mesonlib import MesonException, Popen_safe
+from . import builder, version, cfg
+from ..mesonlib import MesonException, Popen_safe, MachineChoice
 from .. import coredata, mlog
 from ..wrap.wrap import PackageDefinition
 
@@ -35,6 +34,7 @@
     from .. import mparser
     from ..environment import Environment
     from ..interpreterbase import SubProject
+    from ..compilers.rust import RustCompiler
 
     # Copied from typeshed. Blarg that they don't expose this
     class DataclassInstance(Protocol):
@@ -476,10 +476,13 @@ class PackageKey:
 class Interpreter:
     def __init__(self, env: Environment) -> None:
         self.environment = env
+        self.host_rustc = T.cast('RustCompiler', self.environment.coredata.compilers[MachineChoice.HOST]['rust'])
         # Map Cargo.toml's subdir to loaded manifest.
         self.manifests: T.Dict[str, Manifest] = {}
         # Map of cargo package (name + api) to its state
         self.packages: T.Dict[PackageKey, PackageState] = {}
+        # Rustc's config
+        self.cfgs = self._get_cfgs()
 
     def interpret(self, subdir: str) -> mparser.CodeBlockNode:
         manifest = self._load_manifest(subdir)
@@ -526,6 +529,10 @@ def _fetch_package(self, package_name: str, api: str) -> T.Tuple[PackageState, b
             self.environment.wrap_resolver.wraps[meson_depname].type is not None
         pkg = PackageState(manifest, downloaded)
         self.packages[key] = pkg
+        # Merge target specific dependencies that are enabled
+        for condition, dependencies in manifest.target.items():
+            if cfg.eval_cfg(condition, self.cfgs):
+                manifest.dependencies.update(dependencies)
         # Fetch required dependencies recursively.
         for depname, dep in manifest.dependencies.items():
             if not dep.optional:
@@ -599,6 +606,23 @@ def _enable_feature(self, pkg: PackageState, feature: str) -> None:
             else:
                 self._enable_feature(pkg, f)
 
+    def _get_cfgs(self) -> T.Dict[str, str]:
+        cfgs = self.host_rustc.get_cfgs().copy()
+        rustflags = self.environment.coredata.get_external_args(MachineChoice.HOST, 'rust')
+        rustflags_i = iter(rustflags)
+        for i in rustflags_i:
+            if i == '--cfg':
+                cfgs.append(next(rustflags_i))
+        return dict(self._split_cfg(i) for i in cfgs)
+
+    @staticmethod
+    def _split_cfg(cfg: str) -> T.Tuple[str, str]:
+        pair = cfg.split('=', maxsplit=1)
+        value = pair[1] if len(pair) > 1 else ''
+        if value and value[0] == '"':
+            value = value[1:-1]
+        return pair[0], value
+
     def _create_project(self, pkg: PackageState, build: builder.Builder) -> T.List[mparser.BaseNode]:
         """Create the project() function call
 

mesonbuild/compilers/rust.py

@@ -182,10 +182,14 @@ def get_target_libdir(self) -> str:
         return stdo.split('\n', maxsplit=1)[0]
 
     @functools.lru_cache(maxsize=None)
-    def get_crt_static(self) -> bool:
+    def get_cfgs(self) -> T.List[str]:
         cmd = self.get_exelist(ccache=False) + ['--print', 'cfg']
         p, stdo, stde = Popen_safe_logged(cmd)
-        return bool(re.search('^target_feature="crt-static"$', stdo, re.MULTILINE))
+        return stdo.splitlines()
+
+    @functools.lru_cache(maxsize=None)
+    def get_crt_static(self) -> bool:
+        return 'target_feature="crt-static"' in self.get_cfgs()
 
     def get_debug_args(self, is_debug: bool) -> T.List[str]:
         return clike_debug_args[is_debug]

mesonbuild/interpreter/interpreter.py

@@ -1050,6 +1050,7 @@ def _do_subproject_cargo(self, subp_name: str, subdir: str,
         mlog.warning('Cargo subproject is an experimental feature and has no backwards compatibility guarantees.',
                      once=True, location=self.current_node)
         if self.environment.cargo is None:
+            self.add_languages(['rust'], True, MachineChoice.HOST)
             self.environment.cargo = cargo.Interpreter(self.environment)
         with mlog.nested(subp_name):
             ast = self.environment.cargo.interpret(subdir)

test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml

@@ -27,6 +27,9 @@ features = ["f1"]
 [dependencies.libname]
 version = "1"
 
+[target."cfg(unix)".dependencies.unixdep]
+version = "0.1"
+
 [features]
 default = ["f1"]
 f1 = ["f2", "f3"]

test cases/rust/22 cargo subproject/subprojects/foo-0-rs/lib.rs

@@ -8,6 +8,11 @@ extern "C" {
 #[cfg(feature = "foo")]
 #[no_mangle]
 pub extern "C" fn rust_func() -> i32 {
+    #[cfg(unix)]
+    {
+        extern crate unixdep;
+        assert!(unixdep::only_on_unix() == 0);
+    }
     assert!(common::common_func() == 0);
     assert!(libothername::stuff() == 42);
     let v: i32;

test cases/rust/22 cargo subproject/subprojects/unixdep-0.1-rs.wrap

@@ -0,0 +1,2 @@
+[wrap-file]
+method = cargo

test cases/rust/22 cargo subproject/subprojects/unixdep-0.1-rs/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "unixdep"
+version = "0.1"
+edition = "2021"
+
+[lib]
+path = "lib.rs"

test cases/rust/22 cargo subproject/subprojects/unixdep-0.1-rs/lib.rs

@@ -0,0 +1,8 @@
+pub fn only_on_unix() -> i32 {
+    0
+}
+
+#[cfg(not(unix))]
+pub fn broken() -> i32 {
+    plop
+}