Merge pull request #7494 from keszybz/fix-two-warnings

Fix two warnings

mesonbuild/backend/backends.py

@@ -184,9 +184,9 @@ class Backend:
         self.build_to_src = mesonlib.relpath(self.environment.get_source_dir(),
                                              self.environment.get_build_dir())
 
-    def get_target_filename(self, t):
+    def get_target_filename(self, t, *, warn_multi_output: bool = True):
         if isinstance(t, build.CustomTarget):
-            if len(t.get_outputs()) != 1:
+            if warn_multi_output and len(t.get_outputs()) != 1:
                 mlog.warning('custom_target {!r} has more than one output! '
                              'Using the first one.'.format(t.name))
             filename = t.get_outputs()[0]
@@ -262,7 +262,7 @@ class Backend:
         return self.build_to_src
 
     def get_target_private_dir(self, target):
-        return os.path.join(self.get_target_filename(target) + '.p')
+        return os.path.join(self.get_target_filename(target, warn_multi_output=False) + '.p')
 
     def get_target_private_dir_abs(self, target):
         return os.path.join(self.environment.get_build_dir(), self.get_target_private_dir(target))

mesonbuild/interpreter.py

@@ -3122,8 +3122,11 @@ external dependencies (including libraries) must go to "dependencies".''')
             return self.add_languages(args, required, self.machine_from_native_kwarg(kwargs))
         else:
             # absent 'native' means 'both' for backwards compatibility
-            mlog.warning('add_languages is missing native:, assuming languages are wanted for both host and build.',
-                         location=self.current_node)
+            tv = FeatureNew.get_target_version(self.subproject)
+            if FeatureNew.check_version(tv, '0.54.0'):
+                mlog.warning('add_languages is missing native:, assuming languages are wanted for both host and build.',
+                             location=self.current_node)
+
             success = self.add_languages(args, False, MachineChoice.BUILD)
             success &= self.add_languages(args, required, MachineChoice.HOST)
             return success

mesonbuild/interpreterbase.py

@@ -330,7 +330,7 @@ class FeatureDeprecated(FeatureCheckBase):
 
     @staticmethod
     def check_version(target_version: str, feature_version: str) -> bool:
-        # For deprecatoin checks we need to return the inverse of FeatureNew checks
+        # For deprecation checks we need to return the inverse of FeatureNew checks
         return not mesonlib.version_compare_condition_with_min(target_version, feature_version)
 
     @staticmethod

test cases/warning/2 languages missing native/meson.build

@@ -1,2 +1,3 @@
-project('languages missing native')
+project('languages missing native',
+        meson_version : '>= 0.54')
 add_languages('c')

test cases/warning/2 languages missing native/test.json

@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/warning/2 languages missing native/meson.build:2: WARNING: add_languages is missing native:, assuming languages are wanted for both host and build."
+      "line": "test cases/warning/2 languages missing native/meson.build:3: WARNING: add_languages is missing native:, assuming languages are wanted for both host and build."
     }
   ]
 }