From 0f66e796a8522e1043dda03b88d5f6feae839d16 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 16 Aug 2017 10:44:41 +0800 Subject: [PATCH] libgcrypt: fix building error with '-O2' in sysroot path Upstream-Status: Pending Characters like '-O2' or '-Ofast' will be replaced by '-O1' when compiling cipher. If we are cross compiling libgcrypt and sysroot contains such characters, we would get compile errors because the sysroot path has been modified. Fix this by adding blank spaces before and after the original matching pattern in the sed command. Signed-off-by: Chen Qi Rebase to 1.8.0 Signed-off-by: Hongxu Jia --- cipher/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cipher/Makefile.am b/cipher/Makefile.am index c3d642b..88c883a 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -153,7 +153,7 @@ gost-s-box: gost-s-box.c if ENABLE_O_FLAG_MUNGING -o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g' +o_flag_munging = sed -e 's/ -O\([2-9sgz][2-9sgz]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' else o_flag_munging = cat endif