Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 9bf8d34
Add support for the annotation no_provide_shlib
Baptiste Daroussin committed 11 years ago
commit 9bf8d34ff9d6185132e44b8920feae41ba4feeb1
parent d8b3bb5
1 file changed +8 -1
modified libpkg/pkg_elf.c
@@ -378,7 +378,7 @@ analyse_elf(struct pkg *pkg, const char *fpath,
		if (dyn->d_tag != DT_RPATH && dyn->d_tag != DT_RUNPATH)

			continue;
- 
		shlib_list_from_rpath(elf_strptr(e, sh_link, dyn->d_un.d_val),
+ 
		shlib_list_from_rpath(elf_strptr(e, sh_link, dyn->d_un.d_val),

				      dirname(fpath));

		break;

	}
@@ -501,6 +501,13 @@ pkg_analyse_files(struct pkgdb *db, struct pkg *pkg, const char *stage)
		}

	}
+ 
	/*
+ 
	 * if the package is not supposed to provide share libraries then
+ 
	 * drop the provided one
+ 
	 */
+ 
	if (pkg_getannotation(pkg, "no_provide_shlib") != NULL)
+ 
		HASH_FREE(pkg->shlibs_provided, pkg_shlib_free);
+ 


	if (failures)

		goto cleanup;