From 2f26a20813e4ac45c3fdc9d7fc29e1355372679eeb549e8276c6d2a590bf7a0f Mon Sep 17 00:00:00 2001 From: Michael Matz Date: Mon, 28 Feb 2022 14:38:04 +0000 Subject: [PATCH] Accepting request 957237 from home:marxin:branches:devel:gcc - Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify that corresponding flex/bison files are not modified by a patch. OBS-URL: https://build.opensuse.org/request/show/957237 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/binutils?expand=0&rev=391 --- binutils.changes | 6 ++++++ binutils.spec | 18 ++++++++++-------- cross-aarch64-binutils.changes | 6 ++++++ cross-aarch64-binutils.spec | 18 ++++++++++-------- cross-arm-binutils.changes | 6 ++++++ cross-arm-binutils.spec | 18 ++++++++++-------- cross-avr-binutils.changes | 6 ++++++ cross-avr-binutils.spec | 18 ++++++++++-------- cross-epiphany-binutils.changes | 6 ++++++ cross-epiphany-binutils.spec | 18 ++++++++++-------- cross-hppa-binutils.changes | 6 ++++++ cross-hppa-binutils.spec | 18 ++++++++++-------- cross-hppa64-binutils.changes | 6 ++++++ cross-hppa64-binutils.spec | 18 ++++++++++-------- cross-i386-binutils.changes | 6 ++++++ cross-i386-binutils.spec | 18 ++++++++++-------- cross-ia64-binutils.changes | 6 ++++++ cross-ia64-binutils.spec | 18 ++++++++++-------- cross-m68k-binutils.changes | 6 ++++++ cross-m68k-binutils.spec | 18 ++++++++++-------- cross-mips-binutils.changes | 6 ++++++ cross-mips-binutils.spec | 18 ++++++++++-------- cross-ppc-binutils.changes | 6 ++++++ cross-ppc-binutils.spec | 18 ++++++++++-------- cross-ppc64-binutils.changes | 6 ++++++ cross-ppc64-binutils.spec | 18 ++++++++++-------- cross-ppc64le-binutils.changes | 6 ++++++ cross-ppc64le-binutils.spec | 18 ++++++++++-------- cross-pru-binutils.changes | 6 ++++++ cross-pru-binutils.spec | 18 ++++++++++-------- cross-riscv64-binutils.changes | 6 ++++++ cross-riscv64-binutils.spec | 18 ++++++++++-------- cross-rx-binutils.changes | 6 ++++++ cross-rx-binutils.spec | 18 ++++++++++-------- cross-s390-binutils.changes | 6 ++++++ cross-s390-binutils.spec | 18 ++++++++++-------- cross-s390x-binutils.changes | 6 ++++++ cross-s390x-binutils.spec | 18 ++++++++++-------- cross-sparc-binutils.changes | 6 ++++++ cross-sparc-binutils.spec | 18 ++++++++++-------- cross-sparc64-binutils.changes | 6 ++++++ cross-sparc64-binutils.spec | 18 ++++++++++-------- cross-spu-binutils.changes | 6 ++++++ cross-spu-binutils.spec | 18 ++++++++++-------- cross-x86_64-binutils.changes | 6 ++++++ cross-x86_64-binutils.spec | 18 ++++++++++-------- cross-xtensa-binutils.changes | 6 ++++++ cross-xtensa-binutils.spec | 18 ++++++++++-------- 48 files changed, 384 insertions(+), 192 deletions(-) diff --git a/binutils.changes b/binutils.changes index c9c69e1..bea887d 100644 --- a/binutils.changes +++ b/binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/binutils.spec b/binutils.spec index a5c5fca..ee43e3d 100644 --- a/binutils.spec +++ b/binutils.spec @@ -189,6 +189,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -226,14 +231,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-aarch64-binutils.changes +++ b/cross-aarch64-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec index 070d658..06ab3f8 100644 --- a/cross-aarch64-binutils.spec +++ b/cross-aarch64-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-arm-binutils.changes +++ b/cross-arm-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec index 3b7ae44..78836d9 100644 --- a/cross-arm-binutils.spec +++ b/cross-arm-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-avr-binutils.changes +++ b/cross-avr-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec index 3a239a7..8792e3c 100644 --- a/cross-avr-binutils.spec +++ b/cross-avr-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-epiphany-binutils.changes b/cross-epiphany-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-epiphany-binutils.changes +++ b/cross-epiphany-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec index b4116ec..7dd31a5 100644 --- a/cross-epiphany-binutils.spec +++ b/cross-epiphany-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-hppa-binutils.changes +++ b/cross-hppa-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec index f128bf5..ddf00c0 100644 --- a/cross-hppa-binutils.spec +++ b/cross-hppa-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-hppa64-binutils.changes +++ b/cross-hppa64-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec index 5163c3e..0ae579e 100644 --- a/cross-hppa64-binutils.spec +++ b/cross-hppa64-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-i386-binutils.changes +++ b/cross-i386-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec index 06cdf18..8a30e02 100644 --- a/cross-i386-binutils.spec +++ b/cross-i386-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-ia64-binutils.changes +++ b/cross-ia64-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec index 68bf053..e4b27f3 100644 --- a/cross-ia64-binutils.spec +++ b/cross-ia64-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-m68k-binutils.changes b/cross-m68k-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-m68k-binutils.changes +++ b/cross-m68k-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec index 9477ff7..5622c76 100644 --- a/cross-m68k-binutils.spec +++ b/cross-m68k-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-mips-binutils.changes +++ b/cross-mips-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec index d09e0ce..e568baf 100644 --- a/cross-mips-binutils.spec +++ b/cross-mips-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-ppc-binutils.changes +++ b/cross-ppc-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec index e7831b8..32661d8 100644 --- a/cross-ppc-binutils.spec +++ b/cross-ppc-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-ppc64-binutils.changes +++ b/cross-ppc64-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec index 8f66f4e..0d5d08d 100644 --- a/cross-ppc64-binutils.spec +++ b/cross-ppc64-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-ppc64le-binutils.changes b/cross-ppc64le-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-ppc64le-binutils.changes +++ b/cross-ppc64le-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec index e8d477a..237fdb2 100644 --- a/cross-ppc64le-binutils.spec +++ b/cross-ppc64le-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-pru-binutils.changes b/cross-pru-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-pru-binutils.changes +++ b/cross-pru-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-pru-binutils.spec b/cross-pru-binutils.spec index 5a922de..19f0bf8 100644 --- a/cross-pru-binutils.spec +++ b/cross-pru-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-riscv64-binutils.changes b/cross-riscv64-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-riscv64-binutils.changes +++ b/cross-riscv64-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-riscv64-binutils.spec b/cross-riscv64-binutils.spec index 99588a0..a5def09 100644 --- a/cross-riscv64-binutils.spec +++ b/cross-riscv64-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-rx-binutils.changes b/cross-rx-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-rx-binutils.changes +++ b/cross-rx-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-rx-binutils.spec b/cross-rx-binutils.spec index c2b8dd3..24d8845 100644 --- a/cross-rx-binutils.spec +++ b/cross-rx-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-s390-binutils.changes +++ b/cross-s390-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec index 02c27d7..dfe7375 100644 --- a/cross-s390-binutils.spec +++ b/cross-s390-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-s390x-binutils.changes +++ b/cross-s390x-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec index 8496feb..41e49af 100644 --- a/cross-s390x-binutils.spec +++ b/cross-s390x-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-sparc-binutils.changes +++ b/cross-sparc-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec index 1280cc2..8e8225a 100644 --- a/cross-sparc-binutils.spec +++ b/cross-sparc-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-sparc64-binutils.changes +++ b/cross-sparc64-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec index 59f2611..ad304b6 100644 --- a/cross-sparc64-binutils.spec +++ b/cross-sparc64-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-spu-binutils.changes +++ b/cross-spu-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec index edfceef..107090b 100644 --- a/cross-spu-binutils.spec +++ b/cross-spu-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-x86_64-binutils.changes +++ b/cross-x86_64-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec index 46dacf5..afc7c0a 100644 --- a/cross-x86_64-binutils.spec +++ b/cross-x86_64-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil} diff --git a/cross-xtensa-binutils.changes b/cross-xtensa-binutils.changes index c9c69e1..bea887d 100644 --- a/cross-xtensa-binutils.changes +++ b/cross-xtensa-binutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 24 09:10:44 UTC 2022 - Martin Liška + +- Do not re-generate ld/ldlex.c, ld/ldgram.c, ld/ldgram.h and verify + that corresponding flex/bison files are not modified by a patch. + ------------------------------------------------------------------- Thu Feb 24 06:55:14 UTC 2022 - Martin Liška diff --git a/cross-xtensa-binutils.spec b/cross-xtensa-binutils.spec index 784b6b7..c7dee94 100644 --- a/cross-xtensa-binutils.spec +++ b/cross-xtensa-binutils.spec @@ -192,6 +192,11 @@ The Compact C Type Format (CTF) is a way of representing information about a bin %prep echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} + +# Backup flex and biscon files for later verification. +cp ld/ldlex.l ld/ldlex.l.orig +cp ld/ldgram.y ld/ldgram.y.orig + # Patch is outside test_vanilla because it's supposed to be the # patch bringing the tarball to the newest upstream version %patch1 -p1 @@ -229,14 +234,11 @@ cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h # # test_vanilla %endif -# in parallel builds, when the flex or bison inputs are patched (possibly -# in the ...-branch.diff) it might happen that the dependency tracking -# of automake is confused and uses the old .c files from srcdir/ld/ while -# also generating the new .c files in builddir/ld leading to trouble. -# I haven't found the right entries to ensure this doesn't happen, so -# simply remove the intermediates -rm -f ld/ldlex.c -rm -f ld/ldgram.c ld/ldgram.h + +# Due to legacy flex version present in SLE-12 (and older), we cannot +# re-generate flex and bison files and so we verify that any patch modify these files. +diff -u ld/ldlex.l ld/ldlex.l.orig +diff -u ld/ldgram.y ld/ldgram.y.orig %build %define _lto_cflags %{nil}