[PATCH 1/2] libid3tag: Filter -ffile-prefix-map too

[PATCH 1/2] libid3tag: Filter -ffile-prefix-map too

[Khem Raj]

helps when compiler has -ffile-prefix-map flag which helps
reproducibility as well

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../libid3tag/libid3tag/cflags_filter.patch               | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch b/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
index 0d1d0dc381..1895748d1d 100644
--- a/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
+++ b/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
@@ -4,15 +4,13 @@ flags. We need those to generate reproducible binaries. Allow them through.
 Upstream-Status: Pending
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
 
-Index: libid3tag-0.15.1b/configure.ac
-===================================================================
---- libid3tag-0.15.1b.orig/configure.ac
-+++ libid3tag-0.15.1b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -99,6 +99,10 @@ do
  	-mno-cygwin)
  	    shift
  	    ;;
-+	-fmacro-prefix-map*|-fdebug-prefix-map*)
++	-fmacro-prefix-map*|-fdebug-prefix-map*|-ffile-prefix-map*)
 +	    CFLAGS="$CFLAGS $1"
 +	    shift
 +	    ;;
-- 
2.31.1

[PATCH 2/2] libjpeg-turbo: Use --reproducible option for nasm

[Khem Raj]

This ensures that nasm version and timestamps do but appear in build
outputs

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Joshua Watt <JPEWhacker@gmail.com>
---
 meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb
index b6efc6bca0..0bd6af8db9 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb
@@ -29,7 +29,7 @@ RCONFLICTS_${PN} += "jpeg"
 
 inherit cmake pkgconfig
 
-export NASMENV = "--debug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
+export NASMENV = "--reproducible --debug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
 
 # Add nasm-native dependency consistently for all build arches is hard
 EXTRA_OECMAKE_append_class-native = " -DWITH_SIMD=False"
-- 
2.31.1