Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › ca3dd25
pkg {register, check -B}: Fix registering provided shlibs as required
Bryan Drewery committed 11 years ago
commit ca3dd25a6ce72e28bad2f8436baff520fe7df434
parent c94ac3b
1 file changed +16 -0
modified libpkg/pkg_elf.c
@@ -445,8 +445,10 @@ int
pkg_analyse_files(struct pkgdb *db, struct pkg *pkg, const char *stage)

{

	struct pkg_file *file = NULL;
+ 
	struct pkg_shlib *sh, *shtmp, *found;

	int ret = EPKG_OK;

	char fpath[MAXPATHLEN];
+ 
	const char *origin;

	bool developer = false;



	developer = pkg_object_bool(pkg_config_get("DEVELOPER_MODE"));
@@ -480,6 +482,20 @@ pkg_analyse_files(struct pkgdb *db, struct pkg *pkg, const char *stage)
		}

	}
+ 
	pkg_get(pkg, PKG_ORIGIN, &origin);
+ 
	/*
+ 
	 * Do not depend on libraries that a package provides itself
+ 
	 */
+ 
	HASH_ITER(hh, pkg->shlibs_required, sh, shtmp) {
+ 
		HASH_FIND_STR(pkg->shlibs_provided, pkg_shlib_name(sh), found);
+ 
		if (found != NULL) {
+ 
			pkg_debug(2, "remove %s from required shlibs as the "
+ 
			    "package %s provides this library itself",
+ 
			    pkg_shlib_name(sh), origin);
+ 
			HASH_DEL(pkg->shlibs_required, sh);
+ 
		}
+ 
	}
+ 


	ret = EPKG_OK;



cleanup: