intl: Emit no lines in bison generated files

Message ID 20211202071313.2165278-1-raj.khem@gmail.com
State Committed
Commit f8392bb76633f794eea86401899e268bf52cff61
Delegated to: Adhemerval Zanella Netto
Headers
Series intl: Emit no lines in bison generated files |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Khem Raj Dec. 2, 2021, 7:13 a.m. UTC
  Improve reproducibility:
Do not put any #line preprocessor commands in bison generated files.
These lines contain absolute paths containing file locations on
the host build machine.

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 intl/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Adhemerval Zanella Dec. 7, 2021, 5:37 p.m. UTC | #1
On 02/12/2021 04:13, Khem Raj via Libc-alpha wrote:
> Improve reproducibility:

Is there any other reproducibility issue?

> Do not put any #line preprocessor commands in bison generated files.
> These lines contain absolute paths containing file locations on
> the host build machine.
> 
> Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

I think it should be ok to trade some debug information with 
reproducibility.

LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  intl/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/intl/Makefile b/intl/Makefile
> index 93478d87e8..b27a7935eb 100644
> --- a/intl/Makefile
> +++ b/intl/Makefile
> @@ -155,7 +155,7 @@ $(objpfx)tst-gettext6.out: $(objpfx)tst-gettext.out
>  
>  CPPFLAGS += -D'LOCALEDIR="$(localedir)"' \
>  	    -D'LOCALE_ALIAS_PATH="$(localedir)"'
> -BISONFLAGS = --yacc --name-prefix=__gettext --output
> +BISONFLAGS = --yacc --no-lines --name-prefix=__gettext --output
>  
>  $(inst_localedir)/locale.alias: locale.alias $(+force)
>  	$(do-install)
>
  
Khem Raj Dec. 9, 2021, 8:05 p.m. UTC | #2
On Tue, Dec 7, 2021 at 9:37 AM Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
>
>
>
> On 02/12/2021 04:13, Khem Raj via Libc-alpha wrote:
> > Improve reproducibility:
>
> Is there any other reproducibility issue?

I dont think we have more in Yocto that needed patching besides this.

>
> > Do not put any #line preprocessor commands in bison generated files.
> > These lines contain absolute paths containing file locations on
> > the host build machine.
> >
> > Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
> I think it should be ok to trade some debug information with
> reproducibility.
>
> LGTM, thanks.
>
> Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
>
> > ---
> >  intl/Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/intl/Makefile b/intl/Makefile
> > index 93478d87e8..b27a7935eb 100644
> > --- a/intl/Makefile
> > +++ b/intl/Makefile
> > @@ -155,7 +155,7 @@ $(objpfx)tst-gettext6.out: $(objpfx)tst-gettext.out
> >
> >  CPPFLAGS += -D'LOCALEDIR="$(localedir)"' \
> >           -D'LOCALE_ALIAS_PATH="$(localedir)"'
> > -BISONFLAGS = --yacc --name-prefix=__gettext --output
> > +BISONFLAGS = --yacc --no-lines --name-prefix=__gettext --output
> >
> >  $(inst_localedir)/locale.alias: locale.alias $(+force)
> >       $(do-install)
> >
  

Patch

diff --git a/intl/Makefile b/intl/Makefile
index 93478d87e8..b27a7935eb 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -155,7 +155,7 @@  $(objpfx)tst-gettext6.out: $(objpfx)tst-gettext.out
 
 CPPFLAGS += -D'LOCALEDIR="$(localedir)"' \
 	    -D'LOCALE_ALIAS_PATH="$(localedir)"'
-BISONFLAGS = --yacc --name-prefix=__gettext --output
+BISONFLAGS = --yacc --no-lines --name-prefix=__gettext --output
 
 $(inst_localedir)/locale.alias: locale.alias $(+force)
 	$(do-install)