From 967c1ec834f0358049408717f6b57864d3931d32b33b4d50cf494f5ee3e40067 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 22 Jan 2024 13:50:03 +0000 Subject: [PATCH] [boo#1219031] - Re-enable AutoReqProv for cross packages but filter files processed via __requires_exclude_from and __provides_exclude_from. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc14?expand=0&rev=12 --- cross-aarch64-gcc14-bootstrap.spec | 4 +++- cross-aarch64-gcc14.spec | 4 +++- cross-amdgcn-gcc14.spec | 4 +++- cross-arm-gcc14.spec | 4 +++- cross-arm-none-gcc14-bootstrap.spec | 4 +++- cross-arm-none-gcc14.spec | 4 +++- cross-avr-gcc14-bootstrap.spec | 4 +++- cross-avr-gcc14.spec | 4 +++- cross-bpf-gcc14.spec | 4 +++- cross-epiphany-gcc14-bootstrap.spec | 4 +++- cross-epiphany-gcc14.spec | 4 +++- cross-hppa-gcc14-bootstrap.spec | 4 +++- cross-hppa-gcc14.spec | 4 +++- cross-m68k-gcc14.spec | 4 +++- cross-mips-gcc14.spec | 4 +++- cross-nvptx-gcc14.spec | 4 +++- cross-ppc64-gcc14.spec | 4 +++- cross-ppc64le-gcc14-bootstrap.spec | 4 +++- cross-ppc64le-gcc14.spec | 4 +++- cross-pru-gcc14-bootstrap.spec | 4 +++- cross-pru-gcc14.spec | 4 +++- cross-riscv64-elf-gcc14-bootstrap.spec | 4 +++- cross-riscv64-elf-gcc14.spec | 4 +++- cross-riscv64-gcc14-bootstrap.spec | 4 +++- cross-riscv64-gcc14.spec | 4 +++- cross-rx-gcc14-bootstrap.spec | 4 +++- cross-rx-gcc14.spec | 4 +++- cross-s390x-gcc14-bootstrap.spec | 4 +++- cross-s390x-gcc14.spec | 4 +++- cross-sparc-gcc14.spec | 4 +++- cross-sparc64-gcc14.spec | 4 +++- cross-x86_64-gcc14.spec | 4 +++- cross.spec.in | 4 +++- gcc14.changes | 3 +++ 34 files changed, 102 insertions(+), 33 deletions(-) diff --git a/cross-aarch64-gcc14-bootstrap.spec b/cross-aarch64-gcc14-bootstrap.spec index da828d2..b5f40b1 100644 --- a/cross-aarch64-gcc14-bootstrap.spec +++ b/cross-aarch64-gcc14-bootstrap.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-aarch64-gcc14.spec b/cross-aarch64-gcc14.spec index af22245..64eddfb 100644 --- a/cross-aarch64-gcc14.spec +++ b/cross-aarch64-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-amdgcn-gcc14.spec b/cross-amdgcn-gcc14.spec index 4984919..2cd6633 100644 --- a/cross-amdgcn-gcc14.spec +++ b/cross-amdgcn-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-arm-gcc14.spec b/cross-arm-gcc14.spec index 4252421..cddd873 100644 --- a/cross-arm-gcc14.spec +++ b/cross-arm-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-arm-none-gcc14-bootstrap.spec b/cross-arm-none-gcc14-bootstrap.spec index 1afbca9..6032454 100644 --- a/cross-arm-none-gcc14-bootstrap.spec +++ b/cross-arm-none-gcc14-bootstrap.spec @@ -304,7 +304,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -826,6 +825,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-arm-none-gcc14.spec b/cross-arm-none-gcc14.spec index 20e224b..c89b8b1 100644 --- a/cross-arm-none-gcc14.spec +++ b/cross-arm-none-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-avr-gcc14-bootstrap.spec b/cross-avr-gcc14-bootstrap.spec index 1cad0b7..80921d5 100644 --- a/cross-avr-gcc14-bootstrap.spec +++ b/cross-avr-gcc14-bootstrap.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-avr-gcc14.spec b/cross-avr-gcc14.spec index f8b2992..5f7d6a0 100644 --- a/cross-avr-gcc14.spec +++ b/cross-avr-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-bpf-gcc14.spec b/cross-bpf-gcc14.spec index 84bd95d..91bac2b 100644 --- a/cross-bpf-gcc14.spec +++ b/cross-bpf-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-epiphany-gcc14-bootstrap.spec b/cross-epiphany-gcc14-bootstrap.spec index a12e1f0..f8efa12 100644 --- a/cross-epiphany-gcc14-bootstrap.spec +++ b/cross-epiphany-gcc14-bootstrap.spec @@ -304,7 +304,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -826,6 +825,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-epiphany-gcc14.spec b/cross-epiphany-gcc14.spec index 0b28874..701ee55 100644 --- a/cross-epiphany-gcc14.spec +++ b/cross-epiphany-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-hppa-gcc14-bootstrap.spec b/cross-hppa-gcc14-bootstrap.spec index 659c64b..7e530cb 100644 --- a/cross-hppa-gcc14-bootstrap.spec +++ b/cross-hppa-gcc14-bootstrap.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-hppa-gcc14.spec b/cross-hppa-gcc14.spec index 0056f6e..122e4cf 100644 --- a/cross-hppa-gcc14.spec +++ b/cross-hppa-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-m68k-gcc14.spec b/cross-m68k-gcc14.spec index d0e9d61..16d4922 100644 --- a/cross-m68k-gcc14.spec +++ b/cross-m68k-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-mips-gcc14.spec b/cross-mips-gcc14.spec index d662dd3..33685d3 100644 --- a/cross-mips-gcc14.spec +++ b/cross-mips-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-nvptx-gcc14.spec b/cross-nvptx-gcc14.spec index ebfeb7e..59a58ad 100644 --- a/cross-nvptx-gcc14.spec +++ b/cross-nvptx-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-ppc64-gcc14.spec b/cross-ppc64-gcc14.spec index 2084c3b..41f8625 100644 --- a/cross-ppc64-gcc14.spec +++ b/cross-ppc64-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-ppc64le-gcc14-bootstrap.spec b/cross-ppc64le-gcc14-bootstrap.spec index 969f059..3b46f94 100644 --- a/cross-ppc64le-gcc14-bootstrap.spec +++ b/cross-ppc64le-gcc14-bootstrap.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-ppc64le-gcc14.spec b/cross-ppc64le-gcc14.spec index 9c55f0b..b140d99 100644 --- a/cross-ppc64le-gcc14.spec +++ b/cross-ppc64le-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-pru-gcc14-bootstrap.spec b/cross-pru-gcc14-bootstrap.spec index 2803f20..8dc73de 100644 --- a/cross-pru-gcc14-bootstrap.spec +++ b/cross-pru-gcc14-bootstrap.spec @@ -304,7 +304,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -826,6 +825,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-pru-gcc14.spec b/cross-pru-gcc14.spec index 03fe3a9..99cfd6d 100644 --- a/cross-pru-gcc14.spec +++ b/cross-pru-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-riscv64-elf-gcc14-bootstrap.spec b/cross-riscv64-elf-gcc14-bootstrap.spec index a22d893..aaeefe6 100644 --- a/cross-riscv64-elf-gcc14-bootstrap.spec +++ b/cross-riscv64-elf-gcc14-bootstrap.spec @@ -304,7 +304,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -826,6 +825,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-riscv64-elf-gcc14.spec b/cross-riscv64-elf-gcc14.spec index 39352c6..d838dc1 100644 --- a/cross-riscv64-elf-gcc14.spec +++ b/cross-riscv64-elf-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-riscv64-gcc14-bootstrap.spec b/cross-riscv64-gcc14-bootstrap.spec index 5a284c7..2f54867 100644 --- a/cross-riscv64-gcc14-bootstrap.spec +++ b/cross-riscv64-gcc14-bootstrap.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-riscv64-gcc14.spec b/cross-riscv64-gcc14.spec index 0abf67b..f2ba632 100644 --- a/cross-riscv64-gcc14.spec +++ b/cross-riscv64-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-rx-gcc14-bootstrap.spec b/cross-rx-gcc14-bootstrap.spec index 2ec9460..74dc922 100644 --- a/cross-rx-gcc14-bootstrap.spec +++ b/cross-rx-gcc14-bootstrap.spec @@ -304,7 +304,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -826,6 +825,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-rx-gcc14.spec b/cross-rx-gcc14.spec index dfc6888..6c8fadf 100644 --- a/cross-rx-gcc14.spec +++ b/cross-rx-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-s390x-gcc14-bootstrap.spec b/cross-s390x-gcc14-bootstrap.spec index e9d1077..1bf790c 100644 --- a/cross-s390x-gcc14-bootstrap.spec +++ b/cross-s390x-gcc14-bootstrap.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-s390x-gcc14.spec b/cross-s390x-gcc14.spec index 6039652..79b2ae1 100644 --- a/cross-s390x-gcc14.spec +++ b/cross-s390x-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-sparc-gcc14.spec b/cross-sparc-gcc14.spec index c80d4a3..9991c4b 100644 --- a/cross-sparc-gcc14.spec +++ b/cross-sparc-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-sparc64-gcc14.spec b/cross-sparc64-gcc14.spec index 6ab8a01..a4e7016 100644 --- a/cross-sparc64-gcc14.spec +++ b/cross-sparc64-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross-x86_64-gcc14.spec b/cross-x86_64-gcc14.spec index 06edb32..f88fdf0 100644 --- a/cross-x86_64-gcc14.spec +++ b/cross-x86_64-gcc14.spec @@ -303,7 +303,6 @@ Conflicts: cross-%{cross_arch}-gcc14 # the libs, though) Requires: libstdc++6-devel-gcc14 %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -825,6 +824,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/cross.spec.in b/cross.spec.in index ef54f55..402f4f5 100644 --- a/cross.spec.in +++ b/cross.spec.in @@ -214,7 +214,6 @@ Conflicts: cross-%{cross_arch}-gcc@base_ver@ # the libs, though) Requires: libstdc++6-devel-gcc@base_ver@ %endif -AutoReqProv: off %if 0%{!?gcc_accel:1} BuildRequires: update-alternatives Requires(post): update-alternatives @@ -279,6 +278,9 @@ Newlib development files for the amdgcn offload target compiler. %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} +%define __provides_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ +%define __requires_exclude_from ^(%{targetlibsubdir}|%{libsubdir}|%{_prefix}/%{gcc_target_arch})/.*$ + %install cd obj-%{GCCDIST} diff --git a/gcc14.changes b/gcc14.changes index 0d8fe6d..4480ed8 100644 --- a/gcc14.changes +++ b/gcc14.changes @@ -5,6 +5,9 @@ Mon Jan 22 09:50:35 UTC 2024 - Richard Biener - Package more risc-v headers - Add cross-X-newlib-devel requires to newlib cross compilers. [boo#1219031] +- Re-enable AutoReqProv for cross packages but filter files processed + via __requires_exclude_from and __provides_exclude_from. + [boo#1219031] ------------------------------------------------------------------- Fri Jan 19 09:55:53 UTC 2024 - Richard Biener