From 968a10c6ded3f3bcb0eec22b7f02bb57296742e1f7673da56c6147e31cc216af Mon Sep 17 00:00:00 2001 From: Eugenio Paolantonio Date: Thu, 26 Sep 2024 19:11:51 +0200 Subject: [PATCH] _config: Use Prefers/Conflicts to handle gcc-build split (bsc#1230628) We can now avoid using Substitutes: to use the gcc-build packages with this commit [0]. Substitutes would rename the dependencies in the actual built rpm metadata, and that might be unwanted. Move to Prefers + Conflicts combo for all packages related to gcc-build. [0] https://github.com/openSUSE/obs-build/commit/34d14f5ea8cc67f2e217a8a6d38b831629cf9d4e Signed-off-by: Eugenio Paolantonio --- _config | 60 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/_config b/_config index 3c2c8dd..cfad04f 100644 --- a/_config +++ b/_config @@ -3996,22 +3996,52 @@ Prefer: -go1.18-openssl # Split between customer facing and internal compiler see gcc SR#322365 Prefer: cpp-build -Prefer: gcc-build-c++ gcc-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: libstdc++-build-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: 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 Prefer: libyaml-devel Prefer: libwebkitgtk-6_0-4