Build system: enable injection of deps with debug information

Author: howetuft

build-system/luxmake/deps.py

@@ -390,6 +390,12 @@ def main(
         action="store_true",
         help="Extended presets (including RelWithDebInfo & MinSizeRel)",
     )
+    parser.add_argument(
+        "-b",
+        "--build-type",
+        help="Build type from deps",
+        default="Release",
+    )
     if call_args is None:
         args = parser.parse_args()  # Parse command line
     else:
@@ -536,6 +542,7 @@ def main(
         # Next line is a workaround to replace {{profile_dir}}, which is
         # not well handled by deployer...
         CONAN_ENV["LUX_PROFILE_DIR"] = str(profile_dir)
+        build_type = args.build_type or "Release"
 
         logger.info("Conan profile directory is %s", profile_dir)
         main_block = [
@@ -545,7 +552,7 @@ def main(
             "--deployer=full_deploy",
             f"--deployer-folder={output_dir}/dependencies",
             f"--output-folder={output_dir}",
-            "--settings=build_type=Release",
+            f"--settings=build_type={build_type}",
             f"--conf:all=tools.cmake.cmaketoolchain:generator={generator}",
         ]
         if not os.getenv("DEPS_WITHOUT_SUDO"):

build-system/luxmake/wheel.py

@@ -12,6 +12,7 @@
 import platform
 import os
 import shlex
+import itertools
 from pathlib import Path
 
 from .constants import PARAMS
@@ -78,8 +79,11 @@ def _compute_platform_tag():
 def _get_lib_paths():
     """Get library paths for dependencies."""
     base = PARAMS.BINARY_DIR / "dependencies" / "full_deploy" / "host"
-    paths = (str(p.absolute()) for p in base.rglob("**/bin"))
-    result = os.pathsep.join(paths)
+    paths_bin = (str(p.absolute()) for p in base.rglob("**/bin"))
+    paths_lib = (str(p.absolute()) for p in base.rglob("**/lib"))
+    paths = itertools.chain(paths_bin, paths_lib)
+    result = [ ["-l", Path(p)] for p in paths ]
+    result = list(itertools.chain.from_iterable(result))
     return result
 
 
@@ -200,8 +204,7 @@ def make_wheel(args):
             "repairwheel",
             "-l",
             wheel_lib_dir,
-            "-l",
-            _get_lib_paths(),
+            *_get_lib_paths(),
             "-o",
             PARAMS.WHEELHOUSE_DIR,
             input_path,