95b8671 Chech pkg->arch rather than pkg->abi — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Chech pkg->arch rather than pkg->abi

Baptiste Daroussin committed 11 years ago

commit 95b86714ed4cea7c75e92499a2307f9141d3687d
parent aad28d2

1 file changed +2 -2

modified libpkg/pkg_solve.c

@@ -323,10 +323,10 @@ pkg_solve_handle_provide (struct pkg_solve_problem *problem,

 		if (pr->is_shlib) {
 			HASH_FIND_STR(pkg->shlibs_provided, pr->provide, shlp);
 			/* Skip incompatible ABI as well */
 			if (shlp != NULL && strcmp(pkg->abi, orig->abi) != 0) {
 			if (shlp != NULL && strcmp(pkg->arch, orig->arch) != 0) {
 				pkg_debug(2, "require %s: package %s-%s(%c) provides wrong ABI %s, "
 					"wanted %s", pr->provide, pkg->name, pkg->version,
 					pkg->type == PKG_INSTALLED ? 'l' : 'r');
 					pkg->type == PKG_INSTALLED ? 'l' : 'r', orig->arch, pkg->arch);
 				continue;
 			}
 		}