commit: 48cbbded273c08965cd33a74048596339f6d61be Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Aug 17 12:30:21 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Aug 17 12:30:21 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=48cbbded
qmerge: force FEATURES=-preserve-libs, bug #698462 We do not support/implement preserve-libs feature (we could), so drop it from FEATURES such that preserve_old_libs kicks in for some of the crucial libs around. Bug: https://bugs.gentoo.org/698462 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> qmerge.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qmerge.c b/qmerge.c index 2c24bfb..143c4f3 100644 --- a/qmerge.c +++ b/qmerge.c @@ -686,6 +686,9 @@ pkg_run_func_at(int dirfd, const char *vdb_path, const char *phases, const char "D=\"%5$s\"\n" "ED=\"${D%%/}/${EPREFIX%%/}/\"\n" "T=\"%6$s\"\n" + /* we do not support preserve-libs yet, so force + * preserve_old_lib instead */ + "FEATURES=\"${FEATURES/preserve-libs/disabled}\"\n" /* Finally run the func */ "%7$s%2$s\n" /* Ignore func return values (not exit values) */
