Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Pending |
| 2 | |
| 3 | libgcrypt: fix building error with '-O2' in sysroot path |
| 4 | |
| 5 | Characters like '-O2' or '-Ofast' will be replaced by '-O1' when compiling cipher. |
| 6 | If we are cross compiling libgcrypt and sysroot contains such characters, we would |
| 7 | get compile errors because the sysroot path has been modified. |
| 8 | |
| 9 | Fix this by adding blank spaces before and after the original matching pattern in the |
| 10 | sed command. |
| 11 | |
| 12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 13 | --- |
| 14 | cipher/Makefile.am | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/cipher/Makefile.am b/cipher/Makefile.am |
| 18 | index 76cdc96..9a89792 100644 |
| 19 | --- a/cipher/Makefile.am |
| 20 | +++ b/cipher/Makefile.am |
| 21 | @@ -69,7 +69,7 @@ rfc2268.c \ |
| 22 | camellia.c camellia.h camellia-glue.c |
| 23 | |
| 24 | if ENABLE_O_FLAG_MUNGING |
| 25 | -o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' |
| 26 | +o_flag_munging = sed -e 's/ -O\([2-9s][2-9s]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' |
| 27 | else |
| 28 | o_flag_munging = cat |
| 29 | endif |
| 30 | -- |
| 31 | 1.7.9.5 |
| 32 | |