From 4c39a601c9e4f6eaca0424de8313e07f43877f496b34401ab058724653fad469 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 1 Oct 2024 09:33:51 +0200 Subject: [PATCH] Revert "_config: Use Prefers/Conflicts to handle gcc-build split (bsc#1230628)" This reverts commit 968a10c6ded3f3bcb0eec22b7f02bb57296742e1f7673da56c6147e31cc216af. --- _config | 60 +++++++++++++++------------------------------------------ 1 file changed, 15 insertions(+), 45 deletions(-) diff --git a/_config b/_config index 3b42b31..37339b2 100644 --- a/_config +++ b/_config @@ -3991,52 +3991,22 @@ Prefer: -go1.18-openssl # Split between customer facing and internal compiler see gcc SR#322365 Prefer: cpp-build -Prefer: gcc-build-ada -Prefer: gcc-build-go -Prefer: gcc-build -Prefer: gcc-build-info -Prefer: gcc-build-c++ -Prefer: gcc-build-fortran -Prefer: gcc-build-d -Prefer: gcc-build-32bit -Prefer: gcc-build-devel -Prefer: gcc-build-locale -Prefer: gcc-build-c++-32bit -Prefer: gcc-build-fortran-32bit -Prefer: gcc-build-objc -Prefer: gcc-build-objc-32bit -Prefer: gcc-build-obj-c++ -Prefer: gcc-build-PIE -Prefer: gcc-build-ada-32bit -Prefer: gcc-build-go-32bit -Prefer: gcc-build-d-32bit -Prefer: gccjit-build-devel +Prefer: gcc-build-c++ gcc-build Prefer: libstdc++-build-devel -Prefer: libgccjit-build-devel - -Conflict: cpp -Conflict: gcc-ada -Conflict: gcc-go -Conflict: gcc -Conflict: gcc-info -Conflict: gcc-c++ -Conflict: gcc-fortran -Conflict: gcc-d -Conflict: gcc-32bit -Conflict: gcc-devel -Conflict: gcc-locale -Conflict: gcc-c++-32bit -Conflict: gcc-fortran-32bit -Conflict: gcc-objc -Conflict: gcc-objc-32bit -Conflict: gcc-obj-c++ -Conflict: gcc-PIE -Conflict: gcc-ada-32bit -Conflict: gcc-go-32bit -Conflict: gcc-d-32bit -Conflict: gccjit-devel -Conflict: libgccjit-devel -Conflict: libstdc++-devel +Substitute: gcc gcc-build +Substitute: gcc-32bit gcc-build-32bit +Substitute: gcc-ada gcc-build-ada +Substitute: gcc-ada-32bit gcc-build-ada-32bit +Substitute: gcc-c++ gcc-build-c++ +Substitute: gcc-c++-32bit gcc-build-c++-32bit +Substitute: gcc-go gcc-build-go +Substitute: gcc-fortran gcc-build-fortran +Substitute: gcc-objc gcc-build-objc +Substitute: gcc-PIE gcc-build-PIE +Substitute: cpp cpp-build +Substitute: libstdc++-devel libstdc++-build-devel +Substitute: libstdc++-devel-32bit libstdc++-build-devel-32bit +Substitute: libgccjit-devel libgccjit-build-devel Prefer: libyaml-devel Prefer: libwebkitgtk-6_0-4