blob: f9c362431c590e8d80a1b707aed0407034d21756 [file] [log] [blame]
Andrew Geissler90fd73c2021-03-05 15:25:55 -06001From 3c6c10eae0993c8ca60879494c6650f7b8f54ebe Mon Sep 17 00:00:00 2001
Brad Bishopd7bf8c12018-02-25 22:55:05 -05002From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 16 Aug 2017 10:44:41 +0800
Andrew Geissler90fd73c2021-03-05 15:25:55 -06004Subject: [PATCH] libgcrypt: fix building error with '-O2' in sysroot path
Brad Bishopd7bf8c12018-02-25 22:55:05 -05005
6Upstream-Status: Pending
7
8Characters like '-O2' or '-Ofast' will be replaced by '-O1' when
9compiling cipher.
10If we are cross compiling libgcrypt and sysroot contains such
11characters, we would
12get compile errors because the sysroot path has been modified.
13
14Fix this by adding blank spaces before and after the original matching
15pattern in the
16sed command.
17
18Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
19
20Rebase to 1.8.0
21Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Andrew Geissler90fd73c2021-03-05 15:25:55 -060022
Brad Bishopd7bf8c12018-02-25 22:55:05 -050023---
24 cipher/Makefile.am | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/cipher/Makefile.am b/cipher/Makefile.am
Andrew Geissler90fd73c2021-03-05 15:25:55 -060028index d644005..1cf5072 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050029--- a/cipher/Makefile.am
30+++ b/cipher/Makefile.am
Andrew Geissler90fd73c2021-03-05 15:25:55 -060031@@ -147,7 +147,7 @@ gost-s-box: gost-s-box.c
Brad Bishopd7bf8c12018-02-25 22:55:05 -050032
33
34 if ENABLE_O_FLAG_MUNGING
Andrew Geissler90fd73c2021-03-05 15:25:55 -060035-o_flag_munging = sed -e 's/-O\([2-9sg][2-9sg]*\)/-O1/' -e 's/-Ofast/-O1/g'
36+o_flag_munging = sed -e 's/ -O\([2-9sg][2-9sg]*\) / -O1 /' -e 's/ -Ofast / -O1 /g'
Brad Bishopd7bf8c12018-02-25 22:55:05 -050037 else
38 o_flag_munging = cat
39 endif