1From 0f66e796a8522e1043dda03b88d5f6feae839d16 Mon Sep 17 00:00:00 2001 2From: Chen Qi <Qi.Chen@windriver.com> 3Date: Wed, 16 Aug 2017 10:44:41 +0800 4Subject: [PATCH] libgcrypt: fix building error with '-O2' in sysroot path 5 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> 22 23--- 24 cipher/Makefile.am | 2 +- 25 1 file changed, 1 insertion(+), 1 deletion(-) 26 27diff --git a/cipher/Makefile.am b/cipher/Makefile.am 28index c3d642b..88c883a 100644 29--- a/cipher/Makefile.am 30+++ b/cipher/Makefile.am 31@@ -153,7 +153,7 @@ gost-s-box: gost-s-box.c 32 33 34 if ENABLE_O_FLAG_MUNGING 35-o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g' 36+o_flag_munging = sed -e 's/ -O\([2-9sgz][2-9sgz]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' 37 else 38 o_flag_munging = cat 39 endif 40