fix build on SLE/Leap

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc12?expand=0&rev=5
2022-01-14 13:17:05 +00:00 · 2022-01-14 13:17:05 +00:00 · 3a802e631d
commit 3a802e631d
parent 33902a5dd7
29 changed files with 148 additions and 0 deletions
--- a/cross-aarch64-gcc12-bootstrap.spec
+++ b/cross-aarch64-gcc12-bootstrap.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-aarch64-gcc12.spec
+++ b/cross-aarch64-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-amdgcn-gcc12.spec
+++ b/cross-amdgcn-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-arm-gcc12.spec
+++ b/cross-arm-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-arm-none-gcc12-bootstrap.spec
+++ b/cross-arm-none-gcc12-bootstrap.spec
@ -437,6 +437,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-arm-none-gcc12.spec
+++ b/cross-arm-none-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-avr-gcc12-bootstrap.spec
+++ b/cross-avr-gcc12-bootstrap.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-avr-gcc12.spec
+++ b/cross-avr-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-epiphany-gcc12-bootstrap.spec
+++ b/cross-epiphany-gcc12-bootstrap.spec
@ -437,6 +437,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-epiphany-gcc12.spec
+++ b/cross-epiphany-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-hppa-gcc12.spec
+++ b/cross-hppa-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-m68k-gcc12.spec
+++ b/cross-m68k-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-mips-gcc12.spec
+++ b/cross-mips-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-nvptx-gcc12.spec
+++ b/cross-nvptx-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-ppc64-gcc12.spec
+++ b/cross-ppc64-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-ppc64le-gcc12.spec
+++ b/cross-ppc64le-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-riscv64-elf-gcc12-bootstrap.spec
+++ b/cross-riscv64-elf-gcc12-bootstrap.spec
@ -437,6 +437,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-riscv64-elf-gcc12.spec
+++ b/cross-riscv64-elf-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-riscv64-gcc12-bootstrap.spec
+++ b/cross-riscv64-gcc12-bootstrap.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-riscv64-gcc12.spec
+++ b/cross-riscv64-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-rx-gcc12-bootstrap.spec
+++ b/cross-rx-gcc12-bootstrap.spec
@ -437,6 +437,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-rx-gcc12.spec
+++ b/cross-rx-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-s390x-gcc12.spec
+++ b/cross-s390x-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-sparc-gcc12.spec
+++ b/cross-sparc-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-sparc64-gcc12.spec
+++ b/cross-sparc64-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/cross-x86_64-gcc12.spec
+++ b/cross-x86_64-gcc12.spec
@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/gcc.spec.in
+++ b/gcc.spec.in
@ -245,6 +245,7 @@ BuildRequires: gcc-ada
 %if %{build_d}
 %if %{suse_version} < 1550
 BuildRequires: gcc11-d
+BuildRequires: libstdc++6-devel-gcc11
 %else
 BuildRequires: gcc-d
 %endif
@ -1287,6 +1288,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/gcc12-testresults.spec
+++ b/gcc12-testresults.spec
@ -260,6 +260,7 @@ BuildRequires:  gcc-ada
 %if %{build_d}
 %if %{suse_version} < 1550
 BuildRequires:  gcc11-d
+BuildRequires:  libstdc++6-devel-gcc11
 %else
 BuildRequires:  gcc-d
 %endif
@ -626,6 +627,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}
--- a/gcc12.spec
+++ b/gcc12.spec
@ -242,6 +242,7 @@ BuildRequires:  gcc-ada
 %if %{build_d}
 %if %{suse_version} < 1550
 BuildRequires:  gcc11-d
+BuildRequires:  libstdc++6-devel-gcc11
 %else
 BuildRequires:  gcc-d
 %endif
@ -2046,6 +2047,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif

+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}