From 0f34a5b10567333b970ea5c335ee4c98dbe9b9e4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 30 Oct 2020 23:26:13 +0100 Subject: json-glib: fix reproducibility (From OE-Core rev: fd7e1a40bf29b552b90e3b20863b8c79594bcd85) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- ...son-enum-types.c.in-fix-build-reproducibi.patch | 30 ++++++++++++++++++++++ meta/recipes-gnome/json-glib/json-glib_1.6.0.bb | 3 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch (limited to 'meta/recipes-gnome/json-glib') diff --git a/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch b/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch new file mode 100644 index 0000000000..e5bfdcd4b7 --- /dev/null +++ b/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch @@ -0,0 +1,30 @@ +From 0f06c4cb4a57083c08312144b03c8346cf620be6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 30 Oct 2020 22:15:29 +0000 +Subject: [PATCH] json-glib/json-enum-types.c.in: fix build reproducibility + +Changes the comment and include to reference the file basename +instead of the full path. This ensures that the generated file is +reproducible when it is included in source packages meant for debugging. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + json-glib/json-enum-types.c.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/json-glib/json-enum-types.c.in b/json-glib/json-enum-types.c.in +index da07c46..7b39290 100644 +--- a/json-glib/json-enum-types.c.in ++++ b/json-glib/json-enum-types.c.in +@@ -9,8 +9,8 @@ + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ +-#include "@filename@" ++/* enumerations from "@basename@" */ ++#include "@basename@" + + /*** END file-production ***/ + diff --git a/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb b/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb index 3cb637f220..82f983f3c5 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb @@ -19,7 +19,8 @@ GTKDOC_MESON_OPTION = "gtk_doc" GTKDOC_MESON_ENABLE_FLAG = 'enabled' GTKDOC_MESON_DISABLE_FLAG = 'disabled' -SRC_URI += " file://run-ptest" +SRC_URI += "file://run-ptest \ + file://0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch" SRC_URI[archive.sha256sum] = "0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" -- cgit v1.2.3-54-g00ecf