Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 42bed57
Update packages with changed ABI.
Vsevolod Stakhov committed 12 years ago
commit 42bed57550eba2c5f776aa5eee06f13d48eb2350
parent f58bfea
1 file changed +9 -3
modified libpkg/pkg_jobs.c
@@ -1098,7 +1098,7 @@ static bool
pkg_need_upgrade(struct pkg *rp, struct pkg *lp, bool recursive)

{

	int ret, ret1, ret2;
- 
	const char *lversion, *rversion;
+ 
	const char *lversion, *rversion, *larch, *rarch;

	struct pkg_option *lo = NULL, *ro = NULL;

	struct pkg_dep *ld = NULL, *rd = NULL;

	struct pkg_shlib *ls = NULL, *rs = NULL;
@@ -1109,8 +1109,8 @@ pkg_need_upgrade(struct pkg *rp, struct pkg *lp, bool recursive)
	if (pkg_is_locked(lp))

		return (false);
- 
	pkg_get(lp, PKG_VERSION, &lversion);
- 
	pkg_get(rp, PKG_VERSION, &rversion);
+ 
	pkg_get(lp, PKG_VERSION, &lversion, PKG_ARCH, &larch);
+ 
	pkg_get(rp, PKG_VERSION, &rversion, PKG_ARCH, &rarch);



	ret = pkg_version_cmp(lversion, rversion);

	if (ret > 0)
@@ -1118,6 +1118,12 @@ pkg_need_upgrade(struct pkg *rp, struct pkg *lp, bool recursive)
	else if (ret < 0)

		return (true);
+ 
	/* Compare archs */
+ 
	if (strcmp (larch, rarch) != 0) {
+ 
		pkg_set(rp, PKG_REASON, "ABI changed");
+ 
		return (true);
+ 
	}
+ 


	/* compare options */

	for (;;) {

		ret1 = pkg_options(rp, &ro);