From 3804f016edff3066c473d99698338ea70da23e2d7e62cd7fc78421f5f608260d Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 26 May 2021 12:24:09 +0000 Subject: [PATCH] Accepting request 895524 from home:Andreas_Schwab:Factory - Fix value of %slibdir64 for usrmerge OBS-URL: https://build.opensuse.org/request/show/895524 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc11?expand=0&rev=348 --- cross-aarch64-gcc11.changes | 5 +++++ cross-amdgcn-gcc11.changes | 5 +++++ cross-arm-gcc11.changes | 5 +++++ cross-arm-none-gcc11-bootstrap.changes | 5 +++++ cross-arm-none-gcc11.changes | 5 +++++ cross-avr-gcc11-bootstrap.changes | 5 +++++ cross-avr-gcc11.changes | 5 +++++ cross-epiphany-gcc11-bootstrap.changes | 5 +++++ cross-epiphany-gcc11.changes | 5 +++++ cross-hppa-gcc11.changes | 5 +++++ cross-i386-gcc11.changes | 5 +++++ cross-m68k-gcc11.changes | 5 +++++ cross-mips-gcc11.changes | 5 +++++ cross-nvptx-gcc11.changes | 5 +++++ cross-ppc64-gcc11.changes | 5 +++++ cross-ppc64le-gcc11.changes | 5 +++++ cross-riscv64-elf-gcc11-bootstrap.changes | 5 +++++ cross-riscv64-elf-gcc11.changes | 5 +++++ cross-riscv64-gcc11.changes | 5 +++++ cross-rx-gcc11-bootstrap.changes | 5 +++++ cross-rx-gcc11.changes | 5 +++++ cross-s390x-gcc11.changes | 5 +++++ cross-sparc-gcc11.changes | 5 +++++ cross-sparc64-gcc11.changes | 5 +++++ cross-x86_64-gcc11.changes | 5 +++++ gcc.spec.in | 2 +- gcc11-testresults.changes | 5 +++++ gcc11-testresults.spec | 2 +- gcc11.changes | 5 +++++ gcc11.spec | 2 +- 30 files changed, 138 insertions(+), 3 deletions(-) diff --git a/cross-aarch64-gcc11.changes b/cross-aarch64-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-aarch64-gcc11.changes +++ b/cross-aarch64-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-amdgcn-gcc11.changes b/cross-amdgcn-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-amdgcn-gcc11.changes +++ b/cross-amdgcn-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-arm-gcc11.changes b/cross-arm-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-arm-gcc11.changes +++ b/cross-arm-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-arm-none-gcc11-bootstrap.changes b/cross-arm-none-gcc11-bootstrap.changes index 51d35f7..f22c67f 100644 --- a/cross-arm-none-gcc11-bootstrap.changes +++ b/cross-arm-none-gcc11-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-arm-none-gcc11.changes b/cross-arm-none-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-arm-none-gcc11.changes +++ b/cross-arm-none-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-avr-gcc11-bootstrap.changes b/cross-avr-gcc11-bootstrap.changes index 51d35f7..f22c67f 100644 --- a/cross-avr-gcc11-bootstrap.changes +++ b/cross-avr-gcc11-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-avr-gcc11.changes b/cross-avr-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-avr-gcc11.changes +++ b/cross-avr-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-epiphany-gcc11-bootstrap.changes b/cross-epiphany-gcc11-bootstrap.changes index 51d35f7..f22c67f 100644 --- a/cross-epiphany-gcc11-bootstrap.changes +++ b/cross-epiphany-gcc11-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-epiphany-gcc11.changes b/cross-epiphany-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-epiphany-gcc11.changes +++ b/cross-epiphany-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-hppa-gcc11.changes b/cross-hppa-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-hppa-gcc11.changes +++ b/cross-hppa-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-i386-gcc11.changes b/cross-i386-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-i386-gcc11.changes +++ b/cross-i386-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-m68k-gcc11.changes b/cross-m68k-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-m68k-gcc11.changes +++ b/cross-m68k-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-mips-gcc11.changes b/cross-mips-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-mips-gcc11.changes +++ b/cross-mips-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-nvptx-gcc11.changes b/cross-nvptx-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-nvptx-gcc11.changes +++ b/cross-nvptx-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-ppc64-gcc11.changes b/cross-ppc64-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-ppc64-gcc11.changes +++ b/cross-ppc64-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-ppc64le-gcc11.changes b/cross-ppc64le-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-ppc64le-gcc11.changes +++ b/cross-ppc64le-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-riscv64-elf-gcc11-bootstrap.changes b/cross-riscv64-elf-gcc11-bootstrap.changes index 51d35f7..f22c67f 100644 --- a/cross-riscv64-elf-gcc11-bootstrap.changes +++ b/cross-riscv64-elf-gcc11-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-riscv64-elf-gcc11.changes b/cross-riscv64-elf-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-riscv64-elf-gcc11.changes +++ b/cross-riscv64-elf-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-riscv64-gcc11.changes b/cross-riscv64-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-riscv64-gcc11.changes +++ b/cross-riscv64-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-rx-gcc11-bootstrap.changes b/cross-rx-gcc11-bootstrap.changes index 51d35f7..f22c67f 100644 --- a/cross-rx-gcc11-bootstrap.changes +++ b/cross-rx-gcc11-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-rx-gcc11.changes b/cross-rx-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-rx-gcc11.changes +++ b/cross-rx-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-s390x-gcc11.changes b/cross-s390x-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-s390x-gcc11.changes +++ b/cross-s390x-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-sparc-gcc11.changes b/cross-sparc-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-sparc-gcc11.changes +++ b/cross-sparc-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-sparc64-gcc11.changes b/cross-sparc64-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-sparc64-gcc11.changes +++ b/cross-sparc64-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/cross-x86_64-gcc11.changes b/cross-x86_64-gcc11.changes index 51d35f7..f22c67f 100644 --- a/cross-x86_64-gcc11.changes +++ b/cross-x86_64-gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/gcc.spec.in b/gcc.spec.in index 5135fc3..4a17eae 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -24,7 +24,7 @@ %else %define _slibdir %{_libdir} %define slibdir %{_prefix}/lib -%define slibdir64 %{_libdir} +%define slibdir64 %{_prefix}/lib64 %endif # Ada currently fails to build on a few platforms, enable it only diff --git a/gcc11-testresults.changes b/gcc11-testresults.changes index 51d35f7..f22c67f 100644 --- a/gcc11-testresults.changes +++ b/gcc11-testresults.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/gcc11-testresults.spec b/gcc11-testresults.spec index 759f30f..7c57e2d 100644 --- a/gcc11-testresults.spec +++ b/gcc11-testresults.spec @@ -43,7 +43,7 @@ %else %define _slibdir %{_libdir} %define slibdir %{_prefix}/lib -%define slibdir64 %{_libdir} +%define slibdir64 %{_prefix}/lib64 %endif # Ada currently fails to build on a few platforms, enable it only diff --git a/gcc11.changes b/gcc11.changes index 51d35f7..f22c67f 100644 --- a/gcc11.changes +++ b/gcc11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 25 19:21:01 UTC 2021 - Andreas Schwab + +- Fix value of %slibdir64 for usrmerge + ------------------------------------------------------------------- Mon May 10 12:08:19 UTC 2021 - Richard Biener diff --git a/gcc11.spec b/gcc11.spec index 2316bf4..653bfd2 100644 --- a/gcc11.spec +++ b/gcc11.spec @@ -25,7 +25,7 @@ %else %define _slibdir %{_libdir} %define slibdir %{_prefix}/lib -%define slibdir64 %{_libdir} +%define slibdir64 %{_prefix}/lib64 %endif # Ada currently fails to build on a few platforms, enable it only