Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › d767ee0
ABI: during pkg create do not trust ABI, also gather ALTABI
Baptiste Daroussin committed 2 years ago
commit d767ee08242d5b8f2733d184fa72ce4e2a5bbb2e
parent 1abce88
2 files changed +8 -2
modified libpkg/pkg_create.c
@@ -571,6 +571,10 @@ fixup_abi(struct pkg *pkg, const char *rootdir, bool testing)
		pkg->abi = xstrdup(arch);

		defaultarch = true;

	}
+ 
	if (pkg->arch == NULL) {
+ 
		arch = pkg_object_string(pkg_config_get("ALTABI"));
+ 
		pkg->arch = xstrdup(arch);
+ 
	}



	if (!testing)

		pkg_analyse_files(NULL, pkg, rootdir);
modified libpkg/pkg_manifest.c
@@ -947,8 +947,10 @@ pkg_emit_object(struct pkg *pkg, short flags)


	if (pkg->abi == NULL && pkg->arch != NULL)

		pkg->abi = xstrdup(pkg->arch);
- 
	pkg_arch_to_legacy(pkg->abi, legacyarch, BUFSIZ);
- 
	pkg->arch = xstrdup(legacyarch);
+ 
	if (pkg->arch == NULL) {
+ 
		pkg_arch_to_legacy(pkg->abi, legacyarch, BUFSIZ);
+ 
		pkg->arch = xstrdup(legacyarch);
+ 
	}

	pkg_debug(4, "Emitting basic metadata");

	MANIFEST_EXPORT_FIELD(top, pkg, name, string);

	MANIFEST_EXPORT_FIELD(top, pkg, origin, string);