diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-08-16 04:31:19 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-18 10:40:27 +0100 |
commit | 80cecb6cc9a3765aeb8dd4060a4a994c2625a952 (patch) | |
tree | 687b97211403f043b288d3376e50e97737f9e051 /meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch | |
parent | 70de26076f36205b914be1b1911e5fc0afd65edb (diff) | |
download | poky-80cecb6cc9a3765aeb8dd4060a4a994c2625a952.tar.gz |
libgcrypt: 1.7.8 -> 1.8.0
Rebase patches:
- add-pkgconfig-support.patch -> 0001
- libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch -> 0002
- fix-ICE-failure-on-mips-with-option-O-and-g.patch -> 0003
- fix-undefined-reference-to-pthread.patch -> 0004
(From OE-Core rev: b90037da8754009ca7cf2ab996b46b3dae1eb204)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch')
-rw-r--r-- | meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch deleted file mode 100644 index a3e540369c..0000000000 --- a/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
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 | |||