14 lines
595 B
Diff
14 lines
595 B
Diff
|
diff -Nru libsolv-0.7.5/src/rules.c libsolv-0.7.5.patched/src/rules.c
|
||
|
|
--- libsolv-0.7.5/src/rules.c 2019-06-22 17:43:42.000000000 +0200
|
||
|
|
+++ libsolv-0.7.5.patched/src/rules.c 2019-06-23 19:29:11.527890506 +0200
|
||
|
|
@@ -1016,6 +1016,9 @@
|
||
|
|
p = 0;
|
||
|
|
if (s->name == ps->name)
|
||
|
|
{
|
||
|
|
+ /* x86-64: allow cohexistence with x86 arch packages */
|
||
|
|
+ if (ps->arch != s->arch)
|
||
|
|
+ continue;
|
||
|
|
/* optimization: do not add the same-name conflict rule if it was
|
||
|
|
* already added when we looked at the other package.
|
||
|
|
* (this assumes pool_colormatch is symmetric) */
|