Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 1 | From 3c6c10eae0993c8ca60879494c6650f7b8f54ebe Mon Sep 17 00:00:00 2001 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Wed, 16 Aug 2017 10:44:41 +0800 |
Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 4 | Subject: [PATCH] libgcrypt: fix building error with '-O2' in sysroot path |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | Characters like '-O2' or '-Ofast' will be replaced by '-O1' when |
| 9 | compiling cipher. |
| 10 | If we are cross compiling libgcrypt and sysroot contains such |
| 11 | characters, we would |
| 12 | get compile errors because the sysroot path has been modified. |
| 13 | |
| 14 | Fix this by adding blank spaces before and after the original matching |
| 15 | pattern in the |
| 16 | sed command. |
| 17 | |
| 18 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 19 | |
| 20 | Rebase to 1.8.0 |
| 21 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 22 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | --- |
| 24 | cipher/Makefile.am | 2 +- |
| 25 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 26 | |
| 27 | diff --git a/cipher/Makefile.am b/cipher/Makefile.am |
Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 28 | index d644005..1cf5072 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 29 | --- a/cipher/Makefile.am |
| 30 | +++ b/cipher/Makefile.am |
Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 31 | @@ -147,7 +147,7 @@ gost-s-box: gost-s-box.c |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 32 | |
| 33 | |
| 34 | if ENABLE_O_FLAG_MUNGING |
Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 35 | -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 Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 37 | else |
| 38 | o_flag_munging = cat |
| 39 | endif |