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