Replace extra_configure_args by configure_args

Signed-off-by: Uilian Ries <[email protected]>

Author: uilianries

conan/internal/model/conf.py

@@ -101,7 +101,7 @@
     "tools.gnu:pkg_config": "Path to pkg-config executable used by PkgConfig build helper",
     "tools.gnu:build_triplet": "Custom build triplet to pass to Autotools scripts",
     "tools.gnu:host_triplet": "Custom host triplet to pass to Autotools scripts",
-    "tools.gnu:extra_configure_args": "List of extra arguments to pass to configure when using AutotoolsToolchain and GnuToolchain",
+    "tools.gnu:configure_args": "List of extra arguments to pass to configure when using AutotoolsToolchain and GnuToolchain",
     "tools.google.bazel:configs": "List of Bazel configurations to be used as 'bazel build --config=config1 ...'",
     "tools.google.bazel:bazelrc_path": "List of paths to bazelrc files to be used as 'bazel --bazelrc=rcpath1 ... build'",
     "tools.meson.mesontoolchain:backend": "Any Meson backend: ninja, vs, vs2010, vs2012, vs2013, vs2015, vs2017, vs2019, xcode",

conan/tools/gnu/autotoolstoolchain.py

@@ -83,7 +83,7 @@ def __init__(self, conanfile, namespace=None, prefix="/"):
         sysroot = self._conanfile.conf.get("tools.build:sysroot")
         sysroot = sysroot.replace("\\", "/") if sysroot is not None else None
         self.sysroot_flag = "--sysroot {}".format(sysroot) if sysroot else None
-        extra_configure_args = self._conanfile.conf.get("tools.gnu:extra_configure_args",
+        extra_configure_args = self._conanfile.conf.get("tools.gnu:configure_args",
                                                         check_type=list,
                                                         default=[])
 

conan/tools/gnu/gnutoolchain.py

@@ -62,7 +62,7 @@ def __init__(self, conanfile, namespace=None, prefix="/"):
         self.fpic = self._conanfile.options.get_safe("fPIC")
         self.msvc_runtime_flag = self._get_msvc_runtime_flag()
         self.msvc_extra_flags = self._msvc_extra_flags()
-        extra_configure_args = self._conanfile.conf.get("tools.gnu:extra_configure_args",
+        extra_configure_args = self._conanfile.conf.get("tools.gnu:configure_args",
                                                         check_type=list,
                                                         default=[])
         extra_configure_args = {it: None for it in extra_configure_args}

test/unittests/client/toolchain/autotools/autotools_toolchain_test.py

@@ -607,8 +607,8 @@ def test_conf_compiler_executable():
     assert "/c/my/path/myg++" == env["CXX"]
 
 
-def test_autotools_toolchain_conf_extra_configure_args():
-    """Validate that tools.gnu:extra_configure_args are passed to configure command only.
+def test_autotools_toolchain_conf_configure_args():
+    """Validate that tools.gnu:configure_args are passed to configure command only.
 
        The configure args should be passed as list only.
     """
@@ -617,7 +617,7 @@ def test_autotools_toolchain_conf_extra_configure_args():
     conanfile = ConanFileMock()
     conanfile.settings = MockSettings({"os": "Linux", "arch": "x86_64"})
     conanfile.conf = Conf()
-    conanfile.conf.define("tools.gnu:extra_configure_args", ["--foo", "--bar"])
+    conanfile.conf.define("tools.gnu:configure_args", ["--foo", "--bar"])
 
     be = AutotoolsToolchain(conanfile)
     be.generate_args()
@@ -626,8 +626,8 @@ def test_autotools_toolchain_conf_extra_configure_args():
     # make sure it does not forward to make
     assert "--foo" not in obj["make_args"]
 
-    conanfile.conf.define("tools.gnu:extra_configure_args", "--foo --bar")
+    conanfile.conf.define("tools.gnu:configure_args", "--foo --bar")
     with pytest.raises(ConanException) as expected:
         AutotoolsToolchain(conanfile)
-    assert "[conf] tools.gnu:extra_configure_args must be a list-like object. "\
+    assert "[conf] tools.gnu:configure_args must be a list-like object. "\
            "The value '--foo --bar' introduced is a str object" in str(expected)

test/unittests/tools/gnu/test_gnutoolchain.py

@@ -237,22 +237,22 @@ def test_crossbuild_to_android(build_env_mock):
     assert env_vars["STRIP"] == os.path.join(ndk_bin, "llvm-strip")  # does not exist but appears
 
 
-def test_gnu_toolchain_conf_extra_configure_args():
-    """ Validate that tools.gnu:extra_configure_args are passed to the configure_args when
+def test_gnu_toolchain_conf_configure_args():
+    """ Validate that tools.gnu:configure_args are passed to the configure_args when
         building with GnuToolchain.
         The configure args should be passed as a list-like object.
     """
     conanfile = ConanFileMock()
     conanfile.settings = MockSettings({"os": "Linux", "arch": "x86_64"})
     conanfile.conf = Conf()
-    conanfile.conf.define("tools.gnu:extra_configure_args", ["--foo", "--bar"])
+    conanfile.conf.define("tools.gnu:configure_args", ["--foo", "--bar"])
 
     tc = GnuToolchain(conanfile)
     assert tc.configure_args["--foo"] is None
     assert tc.configure_args["--bar"] is None
 
-    conanfile.conf.define("tools.gnu:extra_configure_args", "--foo --bar")
+    conanfile.conf.define("tools.gnu:configure_args", "--foo --bar")
     with pytest.raises(ConanException) as expected:
         GnuToolchain(conanfile)
-    assert "[conf] tools.gnu:extra_configure_args must be a list-like object. " \
+    assert "[conf] tools.gnu:configure_args must be a list-like object. " \
            "The value '--foo --bar' introduced is a str object" in str(expected)