74c2b62 abi: compare abi not altabi — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

abi: compare abi not altabi

Baptiste Daroussin committed 1 year ago

commit 74c2b62efff8f0b6cc30aeef2babe9f6ea756a40
parent bebccb9

1 file changed +2 -2

modified libpkg/pkg_solve.c

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

 		if (pr->is_shlib) {
 			libfound = stringlist_contains(&pkg->shlibs_provided, pr->provide);
 			/* Skip incompatible ABI as well */
 			if (libfound && !STREQ(pkg->altabi, orig->altabi)) {
 			if (libfound && !STREQ(pkg->abi, orig->abi)) {
 				dbg(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->altabi, orig->altabi);
 					pkg->type == PKG_INSTALLED ? 'l' : 'r', pkg->abi, orig->abi);
 				continue;
 			}
 		}