[OE-core] [PATCH] libc6-dbg: improve reproducibility

[Khem Raj]

On Thu, Mar 29, 2018 at 1:19 PM, Juro Bystricky
<juro.bystricky at intel.com> wrote:
> Prevent bison from generating #line comments containing build
> host paths references.
>
> [YOCTO #12625]
>
> Signed-off-by: Juro Bystricky <juro.bystricky at intel.com>
> ---
>  .../glibc/0029-plural_c_no_preprocessor_lines.patch | 21 +++++++++++++++++++++
>  meta/recipes-core/glibc/glibc_2.27.bb               |  1 +
>  2 files changed, 22 insertions(+)
>  create mode 100644 meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch
>
> diff --git a/meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch b/meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch
> new file mode 100644
> index 0000000..6f03e1c
> --- /dev/null
> +++ b/meta/recipes-core/glibc/glibc/0029-plural_c_no_preprocessor_lines.patch
> @@ -0,0 +1,21 @@
> +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.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Juro Bystricky <juro.bystricky at intel.com>
> +
> +diff --git a/intl/Makefile b/intl/Makefile
> +index 2219717..a203780 100644
> +--- a/intl/Makefile
> ++++ b/intl/Makefile
> +@@ -151,7 +151,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
> +

LGTM

> + $(inst_localedir)/locale.alias: locale.alias $(+force)
> +       $(do-install)
> diff --git a/meta/recipes-core/glibc/glibc_2.27.bb b/meta/recipes-core/glibc/glibc_2.27.bb
> index 827857d..f626467 100644
> --- a/meta/recipes-core/glibc/glibc_2.27.bb
> +++ b/meta/recipes-core/glibc/glibc_2.27.bb
> @@ -43,6 +43,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
>             file://0026-reset-dl_load_write_lock-after-forking.patch \
>             file://0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch \
>             file://0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch \
> +           file://0029-plural_c_no_preprocessor_lines.patch \
>  "
>
>  NATIVESDKFIXES ?= ""
> --
> 2.7.4
>