diff --git a/metapkg/packages/__init__.py b/metapkg/packages/__init__.py index 7295038..2b3f26b 100644 --- a/metapkg/packages/__init__.py +++ b/metapkg/packages/__init__.py @@ -14,6 +14,7 @@ PackageFileLayout, MetaPackage, NormalizedName, + PkgConfigMeta, canonicalize_name, get_bundled_pkg, pep440_to_semver, @@ -45,6 +46,7 @@ "BundledAdHocRustPackage", "CMakeTargetBuildSystem", "NormalizedName", + "PkgConfigMeta", "canonicalize_name", "get_bundled_pkg", "pep440_to_semver", diff --git a/metapkg/packages/base.py b/metapkg/packages/base.py index 3088ee9..50d059f 100644 --- a/metapkg/packages/base.py +++ b/metapkg/packages/base.py @@ -1564,23 +1564,29 @@ def configure_dependency( dep, relative_to="pkgbuild", wd=wd ) - build.sh_append_quoted_flags( - conf_args, - f"{var_prefix}_CFLAGS", - [f"-I{rel_path}/include"], - ) - build.sh_append_quoted_flags( - conf_args, - f"{var_prefix}_LIBS", - dep_ldflags, - ) - build.sh_append_quoted_flags( - conf_args, - f"{var_prefix}_CFLAGS", - transitive_cflags, - ) + if var_prefix: + build.sh_append_quoted_flags( + conf_args, + f"{var_prefix}_CFLAGS", + [f"-I{rel_path}/include"] + transitive_cflags, + ) + build.sh_append_quoted_flags( + conf_args, + f"{var_prefix}_LIBS", + dep_ldflags, + ) + else: + build.sh_append_quoted_flags( + conf_args, + "CFLAGS", + [f"-I{rel_path}/include"] + transitive_cflags, + ) + build.sh_append_quoted_ldflags( + conf_args, + dep_ldflags, + ) - elif build.is_stdlib(dep): + elif build.is_stdlib(dep) and pkg_config_meta.provides_pkg_config: conf_args[f"{var_prefix}_CFLAGS"] = f"-D_{var_prefix}_IS_SYSLIB" std_ldflags = [] for shlib in dep.get_shlibs(build):