diff mbox series

[2/2] gcc-source: Drop gengtype manipulation

Message ID 20221103124123.842602-2-richard.purdie@linuxfoundation.org
State New
Headers show
Series [1/2] gcc-shared-source: Fix source date epoch handling | expand

Commit Message

Richard Purdie Nov. 3, 2022, 12:41 p.m. UTC
Whilst we patch gengtype.cc, we don't patch gengtype-lex.cc which would
be the file which would trigger regeneration of files.

The real bug that was likely the cause for this fix is probably SDE issues
with gcc shared workdir so this code can now be dropped.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/gcc/gcc-source.inc | 2 --
 1 file changed, 2 deletions(-)

Comments

Khem Raj Nov. 3, 2022, 5:53 p.m. UTC | #1
On Thu, Nov 3, 2022 at 5:41 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Whilst we patch gengtype.cc, we don't patch gengtype-lex.cc which would
> be the file which would trigger regeneration of files.
>
> The real bug that was likely the cause for this fix is probably SDE issues
> with gcc shared workdir so this code can now be dropped.
>

good catch. LGTM

> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/recipes-devtools/gcc/gcc-source.inc | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc
> index 03837f43811..bf33a4b31ff 100644
> --- a/meta/recipes-devtools/gcc/gcc-source.inc
> +++ b/meta/recipes-devtools/gcc/gcc-source.inc
> @@ -25,8 +25,6 @@ python do_preconfigure () {
>      import subprocess
>      cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize')
>      subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
> -    # See 0044-gengtypes.patch, we need to regenerate this file
> -    bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.cc"))
>      cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure")
>      subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#172627): https://lists.openembedded.org/g/openembedded-core/message/172627
> Mute This Topic: https://lists.openembedded.org/mt/94755300/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc
index 03837f43811..bf33a4b31ff 100644
--- a/meta/recipes-devtools/gcc/gcc-source.inc
+++ b/meta/recipes-devtools/gcc/gcc-source.inc
@@ -25,8 +25,6 @@  python do_preconfigure () {
     import subprocess
     cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize')
     subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
-    # See 0044-gengtypes.patch, we need to regenerate this file
-    bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.cc"))
     cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure")
     subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)