From: Richard Purdie <[email protected]>

Configure was swallowing our cflags meaning the resulting binaries were
not reproducible. Tweak configure not to do that and fix reproducibility.

Signed-off-by: Richard Purdie <[email protected]>
(cherry picked from commit 1395269a6fae5cec01d721e2ad52bd7cb8fc38ce)
Signed-off-by: Steve Sakoman <[email protected]>
---
 .../libid3tag/libid3tag/cflags_filter.patch   | 21 +++++++++++++++++++
 .../libid3tag/libid3tag_0.15.1b.bb            |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 
meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch

diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch 
b/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
new file mode 100644
index 0000000000..0d1d0dc381
--- /dev/null
+++ b/meta/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch
@@ -0,0 +1,21 @@
+configure contains CFLAGS filtering code which was removing our prefix-map
+flags. We need those to generate reproducible binaries. Allow them through.
+
+Upstream-Status: Pending
+Signed-off-by: Richard Purdie <[email protected]>
+
+Index: libid3tag-0.15.1b/configure.ac
+===================================================================
+--- libid3tag-0.15.1b.orig/configure.ac
++++ libid3tag-0.15.1b/configure.ac
+@@ -99,6 +99,10 @@ do
+       -mno-cygwin)
+           shift
+           ;;
++      -fmacro-prefix-map*|-fdebug-prefix-map*)
++          CFLAGS="$CFLAGS $1"
++          shift
++          ;;
+       -m*)
+           arch="$arch $1"
+           shift
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb 
b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
index 0312a610c0..80581765ac 100644
--- a/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
+++ b/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
@@ -15,6 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz \
            file://0001-Fix-gperf-3.1-incompatibility.patch \
            file://10_utf16.patch \
            file://unknown-encoding.patch \
+           file://cflags_filter.patch \
            "
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mad/files/libid3tag/";
 UPSTREAM_CHECK_REGEX = "/projects/mad/files/libid3tag/(?P<pver>.*)/$"
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#149401): 
https://lists.openembedded.org/g/openembedded-core/message/149401
Mute This Topic: https://lists.openembedded.org/mt/81309588/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to