Merge branch 'main' into which_package

conda_build/inspect_pkg.py

@@ -31,7 +31,7 @@
     get_package_obj_files,
     get_untracked_obj_files,
 )
-from conda_build.os_utils.liefldd import codefile_type
+from conda_build.os_utils.liefldd import codefile_class, machofile
 from conda_build.os_utils.macho import get_rpaths, human_filetype
 from conda_build.utils import (
     comma_join,
@@ -363,14 +363,16 @@ def inspect_objects(packages, prefix=sys.prefix, groupby="package"):
 
         info = []
         for f in obj_files:
-            f_info = {}
             path = join(prefix, f)
-            filetype = codefile_type(path)
-            if filetype == "machofile":
-                f_info["filetype"] = human_filetype(path, None)
-                f_info["rpath"] = ":".join(get_rpaths(path))
-                f_info["filename"] = f
-                info.append(f_info)
+            codefile = codefile_class(path)
+            if codefile == machofile:
+                info.append(
+                    {
+                        "filetype": human_filetype(path, None),
+                        "rpath": ":".join(get_rpaths(path)),
+                        "filename": f,
+                    }
+                )
 
         output_string += print_object_info(info, groupby)
     if hasattr(output_string, "decode"):

conda_build/jinja_context.py

@@ -494,34 +494,42 @@ def native_compiler(language, config):
     return compiler
 
 
-def compiler(language, config, permit_undefined_jinja=False):
-    """Support configuration of compilers.  This is somewhat platform specific.
+def _target(language, config, permit_undefined_jinja=False, component="compiler"):
+    """Support configuration of compilers/stdlib.  This is somewhat platform specific.
 
-    Native compilers never list their host - it is always implied.  Generally, they are
+    Native compilers/stdlib never list their host - it is always implied.  Generally, they are
     metapackages, pointing at a package that does specify the host.  These in turn may be
     metapackages, pointing at a package where the host is the same as the target (both being the
     native architecture).
     """
 
-    compiler = native_compiler(language, config)
+    if component == "compiler":
+        package_prefix = native_compiler(language, config)
+    else:
+        package_prefix = language
+
     version = None
     if config.variant:
         target_platform = config.variant.get("target_platform", config.subdir)
-        language_compiler_key = f"{language}_compiler"
-        # fall back to native if language-compiler is not explicitly set in variant
-        compiler = config.variant.get(language_compiler_key, compiler)
-        version = config.variant.get(language_compiler_key + "_version")
+        language_key = f"{language}_{component}"
+        # fall back to native if language-key is not explicitly set in variant
+        package_prefix = config.variant.get(language_key, package_prefix)
+        version = config.variant.get(language_key + "_version")
     else:
         target_platform = config.subdir
 
-    # support cross compilers.  A cross-compiler package will have a name such as
+    # support cross components.  A cross package will have a name such as
     #    gcc_target
     #    gcc_linux-cos6-64
-    compiler = "_".join([compiler, target_platform])
+    package = f"{package_prefix}_{target_platform}"
     if version:
-        compiler = " ".join((compiler, version))
-        compiler = ensure_valid_spec(compiler, warn=False)
-    return compiler
+        package = f"{package} {version}"
+        package = ensure_valid_spec(package, warn=False)
+    return package
+
+
+# ensure we have compiler in namespace
+compiler = partial(_target, component="compiler")
 
 
 def ccache(method, config, permit_undefined_jinja=False):
@@ -788,7 +796,16 @@ def context_processor(
             skip_build_id=skip_build_id,
         ),
         compiler=partial(
-            compiler, config=config, permit_undefined_jinja=permit_undefined_jinja
+            _target,
+            config=config,
+            permit_undefined_jinja=permit_undefined_jinja,
+            component="compiler",
+        ),
+        stdlib=partial(
+            _target,
+            config=config,
+            permit_undefined_jinja=permit_undefined_jinja,
+            component="stdlib",
         ),
         cdt=partial(cdt, config=config, permit_undefined_jinja=permit_undefined_jinja),
         ccache=partial(

conda_build/os_utils/ldd.py

@@ -8,12 +8,7 @@
 
 from conda_build.conda_interface import linked_data, untracked
 from conda_build.os_utils.macho import otool
-from conda_build.os_utils.pyldd import (
-    codefile_class,
-    inspect_linkages,
-    is_codefile,
-    machofile,
-)
+from conda_build.os_utils.pyldd import codefile_class, inspect_linkages, machofile
 
 LDD_RE = re.compile(r"\s*(.*?)\s*=>\s*(.*?)\s*\(.*\)")
 LDD_NOT_FOUND_RE = re.compile(r"\s*(.*?)\s*=>\s*not found")
@@ -118,7 +113,7 @@ def get_package_obj_files(dist, prefix):
     files = get_package_files(dist, prefix)
     for f in files:
         path = join(prefix, f)
-        if is_codefile(path):
+        if codefile_class(path):
             res.append(f)
 
     return res
@@ -130,7 +125,7 @@ def get_untracked_obj_files(prefix):
     files = untracked(prefix)
     for f in files:
         path = join(prefix, f)
-        if is_codefile(path):
+        if codefile_class(path):
             res.append(f)
 
     return res

conda_build/os_utils/liefldd.py

@@ -1,62 +1,58 @@
 # Copyright (C) 2014 Anaconda, Inc
 # SPDX-License-Identifier: BSD-3-Clause
-try:
-    from collections.abc import Hashable
-except ImportError:
-    from collections.abc import Hashable
+from __future__ import annotations
 
 import hashlib
 import json
 import os
 import struct
 import sys
 import threading
+from collections.abc import Hashable
 from fnmatch import fnmatch
 from functools import partial
+from pathlib import Path
 from subprocess import PIPE, Popen
 
+from ..deprecations import deprecated
 from .external import find_executable
 
 # lief cannot handle files it doesn't know about gracefully
 # TODO :: Remove all use of pyldd
 # Currently we verify the output of each against the other
-from .pyldd import codefile_type as codefile_type_pyldd
+from .pyldd import DLLfile, EXEfile, elffile, machofile
+from .pyldd import codefile_type as _codefile_type
 from .pyldd import inspect_linkages as inspect_linkages_pyldd
 
-codefile_type = codefile_type_pyldd
-have_lief = False
 try:
     import lief
 
     lief.logging.disable()
     have_lief = True
-except:
-    pass
+except ImportError:
+    have_lief = False
 
 
+@deprecated("3.28.0", "4.0.0", addendum="Use `isinstance(value, str)` instead.")
 def is_string(s):
-    try:
-        return isinstance(s, basestring)
-    except NameError:
-        return isinstance(s, str)
+    return isinstance(s, str)
 
 
 # Some functions can operate on either file names
 # or an already loaded binary. Generally speaking
 # these are to be avoided, or if not avoided they
 # should be passed a binary when possible as that
 # will prevent having to parse it multiple times.
-def ensure_binary(file):
-    if not is_string(file):
+def ensure_binary(file: str | os.PathLike | Path | lief.Binary) -> lief.Binary | None:
+    if isinstance(file, lief.Binary):
         return file
-    else:
-        try:
-            if not os.path.exists(file):
-                return []
-            return lief.parse(file)
-        except:
-            print(f"WARNING: liefldd: failed to ensure_binary({file})")
-    return None
+    elif not Path(file).exists():
+        return None
+    try:
+        return lief.parse(str(file))
+    except BaseException:
+        print(f"WARNING: liefldd: failed to ensure_binary({file})")
+        return None
 
 
 def nm(filename):
@@ -77,25 +73,57 @@ def nm(filename):
         print("No symbols found")
 
 
-def codefile_type_liefldd(file, skip_symlinks=True):
-    binary = ensure_binary(file)
-    result = None
-    if binary:
-        if binary.format == lief.EXE_FORMATS.PE:
-            if lief.PE.DLL_CHARACTERISTICS:
-                if binary.header.characteristics & lief.PE.HEADER_CHARACTERISTICS.DLL:
-                    result = "DLLfile"
-                else:
-                    result = "EXEfile"
+if have_lief:
+
+    def codefile_class(
+        path: str | os.PathLike | Path,
+        skip_symlinks: bool = False,
+    ) -> type[DLLfile | EXEfile | machofile | elffile] | None:
+        # same signature as conda.os_utils.pyldd.codefile_class
+        if not (binary := ensure_binary(path)):
+            return None
+        elif (
+            binary.format == lief.EXE_FORMATS.PE
+            and lief.PE.HEADER_CHARACTERISTICS.DLL in binary.header.characteristics_list
+        ):
+            return DLLfile
+        elif binary.format == lief.EXE_FORMATS.PE:
+            return EXEfile
         elif binary.format == lief.EXE_FORMATS.MACHO:
-            result = "machofile"
+            return machofile
         elif binary.format == lief.EXE_FORMATS.ELF:
-            result = "elffile"
-    return result
-
+            return elffile
+        else:
+            return None
 
-if have_lief:
-    codefile_type = codefile_type_liefldd
+else:
+    from .pyldd import codefile_class
+
+
+@deprecated(
+    "3.28.0",
+    "4.0.0",
+    addendum="Use `conda_build.os_utils.liefldd.codefile_class` instead.",
+)
+def codefile_type_liefldd(*args, **kwargs) -> str | None:
+    codefile = codefile_class(*args, **kwargs)
+    return codefile.__name__ if codefile else None
+
+
+deprecated.constant(
+    "3.28.0",
+    "4.0.0",
+    "codefile_type_pyldd",
+    _codefile_type,
+    addendum="Use `conda_build.os_utils.pyldd.codefile_class` instead.",
+)
+deprecated.constant(
+    "3.28.0",
+    "4.0.0",
+    "codefile_type",
+    _codefile_type,
+    addendum="Use `conda_build.os_utils.liefldd.codefile_class` instead.",
+)
 
 
 def _trim_sysroot(sysroot):
@@ -111,7 +139,9 @@ def get_libraries(file):
         if binary.format == lief.EXE_FORMATS.PE:
             result = binary.libraries
         else:
-            result = [lib if is_string(lib) else lib.name for lib in binary.libraries]
+            result = [
+                lib if isinstance(lib, str) else lib.name for lib in binary.libraries
+            ]
             # LIEF returns LC_ID_DYLIB name @rpath/libbz2.dylib in binary.libraries. Strip that.
             binary_name = None
             if binary.format == lief.EXE_FORMATS.MACHO:
@@ -505,7 +535,7 @@ def inspect_linkages_lief(
                     while tmp_filename:
                         if (
                             not parent_exe_dirname
-                            and codefile_type(tmp_filename) == "EXEfile"
+                            and codefile_class(tmp_filename) == EXEfile
                         ):
                             parent_exe_dirname = os.path.dirname(tmp_filename)
                         tmp_filename = parents_by_filename[tmp_filename]
@@ -595,7 +625,7 @@ def get_linkages(
     result_pyldd = []
     debug = False
     if not have_lief or debug:
-        if codefile_type(filename) not in ("DLLfile", "EXEfile"):
+        if codefile_class(filename) not in (DLLfile, EXEfile):
             result_pyldd = inspect_linkages_pyldd(
                 filename,
                 resolve_filenames=resolve_filenames,
@@ -607,7 +637,7 @@ def get_linkages(
                 return result_pyldd
         else:
             print(
-                f"WARNING: failed to get_linkages, codefile_type('{filename}')={codefile_type(filename)}"
+                f"WARNING: failed to get_linkages, codefile_class('{filename}')={codefile_class(filename)}"
             )
             return {}
     result_lief = inspect_linkages_lief(