Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Dragonfly want to preserve the old ABI style
Baptiste Daroussin committed 11 years ago
commit bf4a29dba66b156d29ce8d144b2fc40b9761f596
parent 9695960
2 files changed +6 -0
modified libpkg/pkg.h.in
@@ -1411,7 +1411,11 @@ int pkg_test_filesum(struct pkg *);
int pkg_recompute(struct pkgdb *, struct pkg *);
int pkgdb_reanalyse_shlibs(struct pkgdb *, struct pkg *);

+
#ifdef __DragonFly__
+
#define pkg_get_myarch(d, z) pkg_get_myarch_legacy(d, z)
+
#else
int pkg_get_myarch(char *pkgarch, size_t sz);
+
#endif
int pkg_get_myarch_legacy(char *pkgarch, size_t sz);

void pkgdb_cmd(int argc, char **argv);
modified libpkg/pkg_elf.c
@@ -936,6 +936,7 @@ pkg_get_myarch_legacy(char *dest, size_t sz)
	return (0);
}

+
#ifndef __DragonFly__
int
pkg_get_myarch(char *dest, size_t sz)
{
@@ -967,6 +968,7 @@ pkg_get_myarch(char *dest, size_t sz)

	return (0);
}
+
#endif

int
pkg_suggest_arch(struct pkg *pkg, const char *arch, bool isdefault)