Skip to content

Commit f02724f

Browse files
Try pkg-config again
1 parent 67130e7 commit f02724f

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

vinca/main.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,16 @@ def generate_output(pkg_shortname, vinca_conf, distro, version):
321321
output["requirements"]["build"] += [
322322
{"sel(build_platform != target_platform)": "pybind11"}
323323
]
324-
# pkg-config must be in build, not host
324+
# pkg-config must be in build, not host for cross-compile
325325
if "pkg-config" in output["requirements"]["host"]:
326-
output["requirements"]["build"].append("pkg-config")
326+
output["requirements"]["build"] += [
327+
{"sel(build_platform != target_platform)": "pkg-config"}
328+
]
327329
while "pkg-config" in output["requirements"]["host"]:
328330
output["requirements"]["host"].remove("pkg-config")
331+
output["requirements"]["host"] += [
332+
{"sel(build_platform == target_platform)": "pkg-config"}
333+
]
329334

330335
# fixup problems with udev (which is mapped to libusb):
331336
if "libusb" in output["requirements"]["host"]:

0 commit comments

Comments
 (0)