Add support for extra configure arguments (conan-io#18333)

* Add support for extra configure arguments

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

* Check configuration type

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

* Validate type-check for list-like

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

* Replace extra_configure_args by configure_args

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

* Do not check type

Co-authored-by: Francisco Ramírez <[email protected]>

* Do not check type

Co-authored-by: Francisco Ramírez <[email protected]>

* Revert "Replace extra_configure_args by configure_args"

This reverts commit 91ac324.

* Simplify tests^

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

---------

Signed-off-by: Uilian Ries <[email protected]>
Co-authored-by: Francisco Ramírez <[email protected]>

Author: 2 people

conan/internal/model/conf.py

@@ -101,6 +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.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,10 +83,14 @@ 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",
+                                                        check_type=list,
+                                                        default=[])
 
         self.configure_args = (self._default_configure_shared_flags() +
                                self._default_configure_install_flags() +
-                               self._get_triplets())
+                               self._get_triplets() +
+                               extra_configure_args)
         self.autoreconf_args = self._default_autoreconf_flags()
         self.make_args = []
         # Apple stuff

conan/tools/gnu/gnutoolchain.py

@@ -62,6 +62,10 @@ 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",
+                                                        check_type=list,
+                                                        default=[])
+        extra_configure_args = {it: None for it in extra_configure_args}
 
         # Host/Build triplets
         self.triplets_info = {
@@ -92,6 +96,7 @@ def __init__(self, conanfile, namespace=None, prefix="/"):
         self.configure_args.update(self._get_default_configure_shared_flags())
         self.configure_args.update(self._get_default_configure_install_flags())
         self.configure_args.update(self._get_default_triplets())
+        self.configure_args.update(extra_configure_args)
         # Apple stuff
         is_cross_building_osx = (self._is_cross_building
                                  and conanfile.settings_build.get_safe('os') == "Macos"

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

@@ -605,3 +605,23 @@ def test_conf_compiler_executable():
     be = AutotoolsToolchain(conanfile)
     env = be.vars()
     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.
+
+       The configure args should be passed as list only.
+    """
+    f = temp_folder()
+    os.chdir(f)
+    conanfile = ConanFileMock()
+    conanfile.settings = MockSettings({"os": "Linux", "arch": "x86_64"})
+    conanfile.conf = Conf()
+    conanfile.conf.define("tools.gnu:extra_configure_args", ["--foo", "--bar"])
+
+    be = AutotoolsToolchain(conanfile)
+    be.generate_args()
+    obj = load_toolchain_args()
+    assert "--foo --bar" in obj["configure_args"]
+    # make sure it does not forward to make
+    assert "--foo" not in obj["make_args"]

test/unittests/tools/gnu/test_gnutoolchain.py

@@ -235,3 +235,18 @@ def test_crossbuild_to_android(build_env_mock):
     assert gnutc.triplets_info["host"]["triplet"] == "aarch64-linux-android"
     assert env_vars["LD"] == os.path.join(ndk_bin, "ld")  # exists
     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
+        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"])
+
+    tc = GnuToolchain(conanfile)
+    assert tc.configure_args["--foo"] is None
+    assert tc.configure_args["--bar"] is None