Disable glibc-devel-32bit buildrequire on disable_32bit

2022-07-30 10:46:03 +02:00 · 2022-07-30 10:46:03 +02:00 · e4f53d3497
commit e4f53d3497
parent 3c0778e43b
35 changed files with 2914 additions and 5 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -21,5 +21,3 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
-## Specific LFS patterns
-gcc.spec.in filter=lfs diff=lfs merge=lfs -text
--- a/cross-aarch64-gcc12-bootstrap.spec
+++ b/cross-aarch64-gcc12-bootstrap.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-aarch64-gcc12.spec
+++ b/cross-aarch64-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-amdgcn-gcc12.spec
+++ b/cross-amdgcn-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-arm-gcc12.spec
+++ b/cross-arm-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-arm-none-gcc12-bootstrap.spec
+++ b/cross-arm-none-gcc12-bootstrap.spec
@ -189,7 +189,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-arm-none-gcc12.spec
+++ b/cross-arm-none-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-avr-gcc12-bootstrap.spec
+++ b/cross-avr-gcc12-bootstrap.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-avr-gcc12.spec
+++ b/cross-avr-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-epiphany-gcc12-bootstrap.spec
+++ b/cross-epiphany-gcc12-bootstrap.spec
@ -189,7 +189,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-epiphany-gcc12.spec
+++ b/cross-epiphany-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-hppa-gcc12-bootstrap.spec
+++ b/cross-hppa-gcc12-bootstrap.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-hppa-gcc12.spec
+++ b/cross-hppa-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-m68k-gcc12.spec
+++ b/cross-m68k-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-mips-gcc12.spec
+++ b/cross-mips-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-nvptx-gcc12.spec
+++ b/cross-nvptx-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-ppc64-gcc12.spec
+++ b/cross-ppc64-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-ppc64le-gcc12.spec
+++ b/cross-ppc64le-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-pru-gcc12-bootstrap.spec
+++ b/cross-pru-gcc12-bootstrap.spec
@ -189,7 +189,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-pru-gcc12.spec
+++ b/cross-pru-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-riscv64-elf-gcc12-bootstrap.spec
+++ b/cross-riscv64-elf-gcc12-bootstrap.spec
@ -189,7 +189,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-riscv64-elf-gcc12.spec
+++ b/cross-riscv64-elf-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-riscv64-gcc12-bootstrap.spec
+++ b/cross-riscv64-gcc12-bootstrap.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-riscv64-gcc12.spec
+++ b/cross-riscv64-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-rx-gcc12-bootstrap.spec
+++ b/cross-rx-gcc12-bootstrap.spec
@ -189,7 +189,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-rx-gcc12.spec
+++ b/cross-rx-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-s390x-gcc12.spec
+++ b/cross-s390x-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-sparc-gcc12.spec
+++ b/cross-sparc-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-sparc64-gcc12.spec
+++ b/cross-sparc64-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross-x86_64-gcc12.spec
+++ b/cross-x86_64-gcc12.spec
@ -188,7 +188,9 @@ BuildRequires:  libzstd-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/cross.spec.in
+++ b/cross.spec.in
@ -97,7 +97,9 @@ BuildRequires: libzstd-devel
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gettext-devel
+%if 0%{!?disable_32bit:1}
 BuildRequires: glibc-devel-32bit
+%endif
 BuildRequires: mpc-devel
 BuildRequires: mpfr-devel
 BuildRequires: perl
--- a/gcc.spec.in
+++ b/gcc.spec.in
--- a/gcc12-testresults.spec
+++ b/gcc12-testresults.spec
@ -229,7 +229,9 @@ BuildRequires:  texinfo
 %endif
 # until here, but at least renaming and patching info files breaks this
 BuildRequires:  gcc-c++
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl
--- a/gcc12.changes
+++ b/gcc12.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jul 30 08:45:21 UTC 2022 - Stephan Kulow <coolo@suse.com>
+
+- Remove buildrequires on glibc-devel-32bit if disable_32bit is set
+
 -------------------------------------------------------------------
 Tue Jul 26 06:46:45 UTC 2022 - Richard Biener <rguenther@suse.com>

--- a/gcc12.spec
+++ b/gcc12.spec
@ -208,7 +208,9 @@ BuildRequires:  texinfo
 %endif
 # until here, but at least renaming and patching info files breaks this
 BuildRequires:  gcc-c++
+%if 0%{!?disable_32bit:1}
 BuildRequires:  glibc-devel-32bit
+%endif
 BuildRequires:  mpc-devel
 BuildRequires:  mpfr-devel
 BuildRequires:  perl