[packages/meson] filter out rustc target based on machine type with meson >= 1.3.1; rel 2

atler atler at pld-linux.org
Thu Feb 1 23:44:35 CET 2024


commit 9ebcba0f1c958f8c32f32bfa01a2c0f26fe0f097
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Feb 1 23:32:27 2024 +0100

    filter out rustc target based on machine type with meson >= 1.3.1; rel 2
    
    meson 1.3.1 adds support for 'native: true' param that changes compiler
    to one for build machine. same stands for doing 'rust_crate_type: proc-macro'

 meson.spec                              | 2 +-
 rust-proc-macro-filter-out-target.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meson.spec b/meson.spec
index a27492d..f07cd4f 100644
--- a/meson.spec
+++ b/meson.spec
@@ -2,7 +2,7 @@ Summary:	High productivity build system
 Summary(pl.UTF-8):	System budowania o dużej produktywności
 Name:		meson
 Version:	1.3.1
-Release:	1
+Release:	2
 License:	Apache v2.0
 Group:		Development/Tools
 #Source0Download: https://github.com/mesonbuild/meson/releases/
diff --git a/rust-proc-macro-filter-out-target.patch b/rust-proc-macro-filter-out-target.patch
index 11d97b4..94f61bb 100644
--- a/rust-proc-macro-filter-out-target.patch
+++ b/rust-proc-macro-filter-out-target.patch
@@ -30,7 +30,7 @@ index 73741a441..191db485d 100644
                  priv_dir = self.get_target_private_dir(lt)
                  commands += compiler.get_include_args(priv_dir, False)
 +        # filter out --target arguments for host only proc-macro crate
-+        if compiler.language == 'rust' and hasattr(target, 'rust_crate_type') and target.rust_crate_type == 'proc-macro':
++        if compiler.language == 'rust' and hasattr(target, 'for_machine') and target.for_machine == MachineChoice.BUILD:
 +            target_commands = []
 +            target_arg = False
 +            for (i, v) in enumerate(commands):
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meson.git/commitdiff/9ebcba0f1c958f8c32f32bfa01a2c0f26fe0f097



More information about the pld-cvs-commit mailing list