Revert "fix: sysroot property (conan-io#16011)"

This change breaks all our meson builds as when passing --sysroot meson
will prefix every single include directory with the sysroot...

Author: bentonj-omnissa

conan/tools/meson/toolchain.py

@@ -264,11 +264,6 @@ def __init__(self, conanfile, backend=None, native=False):
             default_comp = "cl"
             default_comp_cpp = "cl"
 
-        # Read configuration for sys_root property (honoring existing conf)
-        self._sys_root = self._conanfile_conf.get("tools.build:sysroot", check_type=str)
-        if self._sys_root:
-            self.properties["sys_root"] = self._sys_root
-
         # Read configuration for compilers
         compilers_by_conf = self._conanfile_conf.get("tools.build:compiler_executables", default={},
                                                      check_type=dict)
@@ -428,12 +423,11 @@ def _get_extra_flags(self):
         linker_scripts = self._conanfile_conf.get("tools.build:linker_scripts", default=[], check_type=list)
         linker_script_flags = ['-T"' + linker_script + '"' for linker_script in linker_scripts]
         defines = self._conanfile.conf.get("tools.build:defines", default=[], check_type=list)
-        sys_root = [f"--sysroot={self._sys_root}"] if self._sys_root else [""]
         return {
-            "cxxflags": cxxflags + sys_root + self.extra_cxxflags,
-            "cflags": cflags + sys_root + self.extra_cflags,
+            "cxxflags": cxxflags + self.extra_cxxflags,
+            "cflags": cflags + self.extra_cflags,
             "ldflags": sharedlinkflags + exelinkflags + linker_script_flags
-                       + sys_root + self.extra_ldflags,
+                        + self.extra_ldflags,
             "defines": [f"-D{d}" for d in (defines + self.extra_defines)]
         }
 

test/functional/toolchains/meson/test_meson.py

@@ -6,10 +6,10 @@
 
 import pytest
 
-from conan.test.assets.sources import gen_function_cpp, gen_function_h
-from conan.test.utils.tools import TestClient
 from conans.model.recipe_ref import RecipeReference
+from conan.test.assets.sources import gen_function_cpp, gen_function_h
 from test.functional.toolchains.meson._base import TestMesonBase
+from conan.test.utils.tools import TestClient
 
 
 class MesonToolchainTest(TestMesonBase):

test/integration/toolchains/meson/test_mesontoolchain.py

@@ -1,14 +1,13 @@
 import os
 import platform
-import re
 import textwrap
 
 import pytest
 
 from conan.test.assets.genconanfile import GenConanfile
-from conan.test.utils.tools import TestClient
 from conan.tools.files import load
 from conan.tools.meson import MesonToolchain
+from conan.test.utils.tools import TestClient
 
 
 def test_apple_meson_keep_user_custom_flags():
@@ -598,51 +597,3 @@ def test_compiler_path_with_spaces():
     conan_meson_native = client.load("conan_meson_native.ini")
     assert "c = 'c compiler path with spaces'" in conan_meson_native
     assert "cpp = 'cpp compiler path with spaces'" in conan_meson_native
-
-
-def test_meson_sysroot_app():
-    """Testing when users pass tools.build:sysroot on the profile with Meson
-
-    The generated conan_meson_cross.ini needs to contain both sys_root property to fill the
-    PKG_CONFIG_PATH and the compiler flags with --sysroot.
-
-    When cross-building, Meson needs both compiler_executables in the config, otherwise it will fail
-    when running setup.
-    """
-    sysroot = "/my/new/sysroot/path"
-    client = TestClient()
-    profile = textwrap.dedent(f"""
-    [settings]
-    os = Macos
-    arch = armv8
-    compiler = apple-clang
-    compiler.version = 13.0
-    compiler.libcxx = libc++
-
-    [conf]
-    tools.build:sysroot={sysroot}
-    tools.build:verbosity=verbose
-    tools.compilation:verbosity=verbose
-    tools.apple:sdk_path=/my/sdk/path
-    """)
-    profile_build = textwrap.dedent(f"""
-    [settings]
-    os = Macos
-    arch = x86_64
-    compiler = apple-clang
-    compiler.version = 13.0
-    compiler.libcxx = libc++
-    """)
-    client.save({"conanfile.py": GenConanfile(name="hello", version="0.1")
-                .with_settings("os", "arch", "compiler", "build_type")
-                .with_generator("MesonToolchain"),
-                 "build": profile_build,
-                 "host": profile})
-    client.run("install . -pr:h host -pr:b build")
-    # Check the meson configuration file
-    conan_meson = client.load(os.path.join(client.current_folder, "conan_meson_cross.ini"))
-    assert f"sys_root = '{sysroot}'\n" in conan_meson
-    assert re.search(r"c_args =.+--sysroot={}.+".format(sysroot), conan_meson)
-    assert re.search(r"c_link_args =.+--sysroot={}.+".format(sysroot), conan_meson)
-    assert re.search(r"cpp_args =.+--sysroot={}.+".format(sysroot), conan_meson)
-    assert re.search(r"cpp_link_args =.+--sysroot={}.+".format(sysroot), conan_meson)