Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Make pkg_register_shlibs start() from an empty list, and add it to pkg create
Matthew Seaman committed 13 years ago
commit b5e9ee75797d5035cca5630f6ca9b5203e175de7
parent 25f3a6d
2 files changed +8 -0
modified libpkg/pkg_create.c
@@ -78,6 +78,12 @@ pkg_create_from_dir(struct pkg *pkg, const char *root,
		}
	}

+
	/*
+
	 * Register shared libraries used by the package if SHLIBS
+
	 * enabled in conf.  Deletes shlib info if not.
+
	 */
+
	pkg_register_shlibs(pkg);
+

	pkg_emit_manifest(pkg, &m);
	packing_append_buffer(pkg_archive, m, "+MANIFEST", strlen(m));
	free(m);
modified libpkg/pkg_elf.c
@@ -372,6 +372,8 @@ pkg_register_shlibs(struct pkg *pkg)

	pkg_config_bool(PKG_CONFIG_SHLIBS, &shlibs);

+
	pkg_list_free(pkg, PKG_SHLIBS);
+

	if (!shlibs)
		return (EPKG_OK);