From 974267ffde2ab15b18b48ddcb52352c136c580dc Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 1 Apr 2022 11:55:49 +0000 Subject: [PATCH] - Add provides/conflicts to libgccjit OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc12?expand=0&rev=28 --- cross-aarch64-gcc12-bootstrap.changes | 1 + cross-aarch64-gcc12.changes | 1 + cross-amdgcn-gcc12.changes | 1 + cross-arm-gcc12.changes | 1 + cross-arm-none-gcc12-bootstrap.changes | 1 + cross-arm-none-gcc12.changes | 1 + cross-avr-gcc12-bootstrap.changes | 1 + cross-avr-gcc12.changes | 1 + cross-epiphany-gcc12-bootstrap.changes | 1 + cross-epiphany-gcc12.changes | 1 + cross-hppa-gcc12-bootstrap.changes | 1 + cross-hppa-gcc12.changes | 1 + cross-m68k-gcc12.changes | 1 + cross-mips-gcc12.changes | 1 + cross-nvptx-gcc12.changes | 1 + cross-ppc64-gcc12.changes | 1 + cross-ppc64le-gcc12.changes | 1 + cross-riscv64-elf-gcc12-bootstrap.changes | 1 + cross-riscv64-elf-gcc12.changes | 1 + cross-riscv64-gcc12-bootstrap.changes | 1 + cross-riscv64-gcc12.changes | 1 + cross-rx-gcc12-bootstrap.changes | 1 + cross-rx-gcc12.changes | 1 + cross-s390x-gcc12.changes | 1 + cross-sparc-gcc12.changes | 1 + cross-sparc64-gcc12.changes | 1 + cross-x86_64-gcc12.changes | 1 + gcc.spec.in | 7 +++++++ gcc12-testresults.changes | 1 + gcc12.changes | 1 + gcc12.spec | 7 +++++++ 31 files changed, 43 insertions(+) diff --git a/cross-aarch64-gcc12-bootstrap.changes b/cross-aarch64-gcc12-bootstrap.changes index 3175d33..4ced77a 100644 --- a/cross-aarch64-gcc12-bootstrap.changes +++ b/cross-aarch64-gcc12-bootstrap.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-aarch64-gcc12.changes b/cross-aarch64-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-aarch64-gcc12.changes +++ b/cross-aarch64-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-amdgcn-gcc12.changes b/cross-amdgcn-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-amdgcn-gcc12.changes +++ b/cross-amdgcn-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-arm-gcc12.changes b/cross-arm-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-arm-gcc12.changes +++ b/cross-arm-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-arm-none-gcc12-bootstrap.changes b/cross-arm-none-gcc12-bootstrap.changes index 3175d33..4ced77a 100644 --- a/cross-arm-none-gcc12-bootstrap.changes +++ b/cross-arm-none-gcc12-bootstrap.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-arm-none-gcc12.changes b/cross-arm-none-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-arm-none-gcc12.changes +++ b/cross-arm-none-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-avr-gcc12-bootstrap.changes b/cross-avr-gcc12-bootstrap.changes index 3175d33..4ced77a 100644 --- a/cross-avr-gcc12-bootstrap.changes +++ b/cross-avr-gcc12-bootstrap.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-avr-gcc12.changes b/cross-avr-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-avr-gcc12.changes +++ b/cross-avr-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-epiphany-gcc12-bootstrap.changes b/cross-epiphany-gcc12-bootstrap.changes index 3175d33..4ced77a 100644 --- a/cross-epiphany-gcc12-bootstrap.changes +++ b/cross-epiphany-gcc12-bootstrap.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-epiphany-gcc12.changes b/cross-epiphany-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-epiphany-gcc12.changes +++ b/cross-epiphany-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-hppa-gcc12-bootstrap.changes b/cross-hppa-gcc12-bootstrap.changes index 3175d33..4ced77a 100644 --- a/cross-hppa-gcc12-bootstrap.changes +++ b/cross-hppa-gcc12-bootstrap.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-hppa-gcc12.changes b/cross-hppa-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-hppa-gcc12.changes +++ b/cross-hppa-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-m68k-gcc12.changes b/cross-m68k-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-m68k-gcc12.changes +++ b/cross-m68k-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-mips-gcc12.changes b/cross-mips-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-mips-gcc12.changes +++ b/cross-mips-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-nvptx-gcc12.changes b/cross-nvptx-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-nvptx-gcc12.changes +++ b/cross-nvptx-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-ppc64-gcc12.changes b/cross-ppc64-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-ppc64-gcc12.changes +++ b/cross-ppc64-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-ppc64le-gcc12.changes b/cross-ppc64le-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-ppc64le-gcc12.changes +++ b/cross-ppc64le-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-riscv64-elf-gcc12-bootstrap.changes b/cross-riscv64-elf-gcc12-bootstrap.changes index 3175d33..4ced77a 100644 --- a/cross-riscv64-elf-gcc12-bootstrap.changes +++ b/cross-riscv64-elf-gcc12-bootstrap.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-riscv64-elf-gcc12.changes b/cross-riscv64-elf-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-riscv64-elf-gcc12.changes +++ b/cross-riscv64-elf-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-riscv64-gcc12-bootstrap.changes b/cross-riscv64-gcc12-bootstrap.changes index 3175d33..4ced77a 100644 --- a/cross-riscv64-gcc12-bootstrap.changes +++ b/cross-riscv64-gcc12-bootstrap.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-riscv64-gcc12.changes b/cross-riscv64-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-riscv64-gcc12.changes +++ b/cross-riscv64-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-rx-gcc12-bootstrap.changes b/cross-rx-gcc12-bootstrap.changes index 3175d33..4ced77a 100644 --- a/cross-rx-gcc12-bootstrap.changes +++ b/cross-rx-gcc12-bootstrap.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-rx-gcc12.changes b/cross-rx-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-rx-gcc12.changes +++ b/cross-rx-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-s390x-gcc12.changes b/cross-s390x-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-s390x-gcc12.changes +++ b/cross-s390x-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-sparc-gcc12.changes b/cross-sparc-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-sparc-gcc12.changes +++ b/cross-sparc-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-sparc64-gcc12.changes b/cross-sparc64-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-sparc64-gcc12.changes +++ b/cross-sparc64-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/cross-x86_64-gcc12.changes b/cross-x86_64-gcc12.changes index 3175d33..4ced77a 100644 --- a/cross-x86_64-gcc12.changes +++ b/cross-x86_64-gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/gcc.spec.in b/gcc.spec.in index c5fde1d..9023516 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -1050,6 +1050,9 @@ Runtime library for the GNU D language. Summary: The GNU Compiler Collection JIT library License: GPL-3.0-or-later Provides: libgccjit%{libgccjit_sover} = %{version}-%{release} +# Only one package may provide this - allows multiple gcc versions +# to co-exist without an overly large list of provides/obsoletes +Conflicts: %selfconflict libgccjit%{libgccjit_sover} Requires: gcc@base_ver@ %description -n libgccjit%{libgccjit_sover}%{libgccjit_suffix} @@ -1063,6 +1066,10 @@ Support for embedding GCC inside programs and libraries Summary: Support for embedding GCC inside programs and libraries License: GPL-3.0-or-later Group: Development/Languages/C and C++ +Provides: libgccjit%{libgccjit_sover}-devel = %{version}-%{release} +# Only one gccjit package can be installed at the same time since +# header files conflict +Conflicts: %selfconflict libgccjit%{libgccjit_sover}-devel Requires: libgccjit%{libgccjit_sover}%{libgccjit_suffix} %description -n libgccjit%{libgccjit_sover}-devel%{libdevel_suffix} diff --git a/gcc12-testresults.changes b/gcc12-testresults.changes index 3175d33..4ced77a 100644 --- a/gcc12-testresults.changes +++ b/gcc12-testresults.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/gcc12.changes b/gcc12.changes index 3175d33..4ced77a 100644 --- a/gcc12.changes +++ b/gcc12.changes @@ -3,6 +3,7 @@ Fri Apr 1 09:52:40 UTC 2022 - Richard Biener - Add provides/conflicts to glibc crosses since only one GCC version for the same target can be installed at the same time. +- Add provides/conflicts to libgccjit ------------------------------------------------------------------- Mon Mar 28 09:23:34 UTC 2022 - Martin Liška diff --git a/gcc12.spec b/gcc12.spec index a82959c..3bbf3e8 100644 --- a/gcc12.spec +++ b/gcc12.spec @@ -1867,6 +1867,9 @@ Runtime library for the GNU D language. Summary: The GNU Compiler Collection JIT library License: GPL-3.0-or-later Provides: libgccjit%{libgccjit_sover} = %{version}-%{release} +# Only one package may provide this - allows multiple gcc versions +# to co-exist without an overly large list of provides/obsoletes +Conflicts: %selfconflict libgccjit%{libgccjit_sover} Requires: gcc12 %description -n libgccjit%{libgccjit_sover}%{libgccjit_suffix} @@ -1880,6 +1883,10 @@ Support for embedding GCC inside programs and libraries Summary: Support for embedding GCC inside programs and libraries License: GPL-3.0-or-later Group: Development/Languages/C and C++ +Provides: libgccjit%{libgccjit_sover}-devel = %{version}-%{release} +# Only one gccjit package can be installed at the same time since +# header files conflict +Conflicts: %selfconflict libgccjit%{libgccjit_sover}-devel Requires: libgccjit%{libgccjit_sover}%{libgccjit_suffix} %description -n libgccjit%{libgccjit_sover}-devel%{libdevel_suffix}