Skip to content

Commit

Permalink
cbuild: put binpkg_deps all in one place
Browse files Browse the repository at this point in the history
  • Loading branch information
q66 committed Jan 29, 2025
1 parent d70ffee commit 20a40d9
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/cbuild/core/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,8 @@ def install(pkg, origpkg, step, depmap, hostdep, update_check):
if not cross and (pkgn == origpkg or pkgn == pkg.pkgname):
pkg.error(f"[host] build loop detected: {pkgn} <-> {origpkg}")
# build from source
host_missing_deps.append((pkgn, sver, fulln))
host_missing_deps.append(fulln)
host_binpkgs_deps.append(f"{pkgn}={sver}")

Check failure on line 378 in src/cbuild/core/dependencies.py

View workflow job for this annotation

GitHub Actions / Lint tree and check format

Ruff (F821)

src/cbuild/core/dependencies.py:378:9: F821 Undefined name `host_binpkgs_deps`

for sver, pkgn, fulln in itdeps:
# check if available in repository
Expand All @@ -393,7 +394,8 @@ def install(pkg, origpkg, step, depmap, hostdep, update_check):
if pkgn == origpkg or pkgn == pkg.pkgname:
pkg.error(f"[target] build loop detected: {pkgn} <-> {origpkg}")
# build from source
missing_deps.append((pkgn, sver, fulln))
missing_deps.append(fulln)
binpkgs_deps.append(f"{pkgn}={sver}")

Check failure on line 398 in src/cbuild/core/dependencies.py

View workflow job for this annotation

GitHub Actions / Lint tree and check format

Ruff (F821)

src/cbuild/core/dependencies.py:398:9: F821 Undefined name `binpkgs_deps`

for origin, dep in irdeps:
pkgn, pkgv, pkgop = autil.split_pkg_name(dep)
Expand Down Expand Up @@ -436,7 +438,7 @@ def install(pkg, origpkg, step, depmap, hostdep, update_check):
# if this triggers any build of its own, it will return true
missing = False

for pn, pv, fulln in host_missing_deps:
for fulln in host_missing_deps:
try:
build.build(
step,
Expand All @@ -463,9 +465,8 @@ def install(pkg, origpkg, step, depmap, hostdep, update_check):
missing = True
except template.SkipPackage:
pass
host_binpkg_deps.append(f"{pn}={pv}")

for pn, pv, fulln in missing_deps:
for fulln in missing_deps:
try:
build.build(
step,
Expand All @@ -492,7 +493,6 @@ def install(pkg, origpkg, step, depmap, hostdep, update_check):
missing = True
except template.SkipPackage:
pass
binpkg_deps.append(f"{pn}={pv}")

for rd, rop, rv in missing_rdeps:
rdv, fulln = _srcpkg_ver(rd, pkg)
Expand Down

0 comments on commit 20a40d9

Please sign in to comment.