Skip to contentSkip to conversation

gperf: Switch to upstream patch

PATCH Richard Purdie 1 participant 1 message Jul 5, 2022 1 message not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive
Quoted 46 lines · Richard Purdie via lists.openembedded.org

Upstream merged a patch to handle the reproducibility issue, switch to their patch which is functionally equivalent.

---
 ...c6e57a308a05889c80c048dbc58bdc378dcb.patch | 203 ++++++++++++++++++
 .../gperf/gperf/reproducibility.patch         |  26 ---
 meta/recipes-extended/gperf/gperf_3.1.bb      |   2 +-
 3 files changed, 204 insertions(+), 27 deletions(-)
 create mode 100644 meta/recipes-extended/gperf/gperf/1862c6e57a308a05889c80c048dbc58bdc378dcb.patch
 delete mode 100644 meta/recipes-extended/gperf/gperf/reproducibility.patch
meta/recipes-extended/gperf/gperf/1862c6e57a308a05889c80c048dbc58bdc378dcb.patch new file +28 -0
new file mode 100644
index 00000000000..6d1c1ad5d51
@@ -0,0 +1,203 @@
+From 1862c6e57a308a05889c80c048dbc58bdc378dcb Mon Sep 17 00:00:00 2001
+From: Bruno Haible <[email protected]>
+Date: Tue, 5 Jul 2022 07:51:46 +0200
+Subject: [PATCH] Add support for reproducible builds.
+
+Suggested by Richard Purdie <[email protected]> in
+<https://lists.gnu.org/archive/html/bug-gperf/2022-07/msg00000.html>.
+
+* autogen.sh: Import also lib/filename.h.
+* Makefile.in (IMPORTED_FILES): Add lib/filename.h.
+* src/options.cc: Include filename.h.
+(Options::print_options): Print only the base name of the program name.
+* tests/*.exp: Update.
+
+Upstream-Status: Backport
+
+---
+ ChangeLog            | 11 +++++++++++
+ Makefile.in          |  3 ++-
+ autogen.sh           |  5 +++--
+ lib/.gitignore       |  3 +++
+ src/options.cc       | 11 +++++++++++
+ tests/c-parse.exp    |  2 +-
+ tests/charsets.exp   |  2 +-
+ tests/chill.exp      |  2 +-
+ tests/cplusplus.exp  |  2 +-
+ tests/gpc.exp        |  2 +-
+ tests/incomplete.exp |  2 +-

meta/recipes-extended/gperf/gperf/1862c6e57a308a05889c80c048dbc58bdc378dcb.patch line 38

Quoted 10 lines
meta/recipes-extended/gperf/gperf/1862c6e57a308a05889c80c048dbc58bdc378dcb.patch new file +10 -0
+ tests/java.exp       |  2 +-
+ tests/languages.exp  |  2 +-
+ tests/modula2.exp    |  2 +-
+ tests/objc.exp       |  2 +-
+ tests/permut2.exp    |  2 +-
+ tests/permut3.exp    |  2 +-
+ tests/permutc2.exp   |  2 +-
+ tests/test-4.exp     |  2 +-
+ 19 files changed, 44 insertions(+), 17 deletions(-)
+

I'll trim this header out as obviously I didn't backport all the pieces for things like the tests since we don't currently use those and we don't have autogen.sh in the release tarball.

Cheers,

Richard