git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001
   2 From: "simit.ghane" <simit.ghane@lge.com>
   3 Date: Tue, 11 Jun 2024 07:22:28 +0530
   4 Subject: [PATCH] random:cipher: handle substitution in sed command
   5
   6 Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=e96df0c82e086bf348753d2d0fa37fa6191b4b14]
   7
   8 * cipher/Makefile.am (o_flag_munging): Add 'g' flag for first sed
   9 expression.
  10 * random/Makefile.am (o_flag_munging): Likewise.
  11 --
  12
  13 It was there earlier and accidentally removed from
  14 Makefile.am of cipher and random
  15
  16 Signed-off-by: simit.ghane <simit.ghane@lge.com>
  17 [jk: add changelog to commit message]
  18 Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
  19 ---
  20  cipher/Makefile.am | 2 +-
  21  random/Makefile.am | 2 +-
  22  2 files changed, 2 insertions(+), 2 deletions(-)
  23
  24 diff --git a/cipher/Makefile.am b/cipher/Makefile.am
  25 index ea9014cc98..149c9f2101 100644
  26 --- a/cipher/Makefile.am
  27 +++ b/cipher/Makefile.am
  28 @@ -169,7 +169,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c
  29
  30
  31  if ENABLE_O_FLAG_MUNGING
  32 -o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g'
  33 +o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g'
  34  else
  35  o_flag_munging = cat
  36  endif
  37 diff --git a/random/Makefile.am b/random/Makefile.am
  38 index c7100ef8b8..a42e430649 100644
  39 --- a/random/Makefile.am
  40 +++ b/random/Makefile.am
  41 @@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h
  42
  43  # The rndjent module needs to be compiled without optimization.  */
  44  if ENABLE_O_FLAG_MUNGING
  45 -o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g'
  46 +o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g'
  47  else
  48  o_flag_munging = cat
  49  endif