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/0002-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/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch')
-rw-r--r-- | meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch new file mode 100644 index 0000000000..d7554f38af --- /dev/null +++ b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 97570ef271ea1fb7b5ca903eec88f68407b0ec76 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Wed, 16 Aug 2017 10:44:41 +0800 | ||
4 | Subject: [PATCH 2/4] libgcrypt: fix building error with '-O2' in sysroot path | ||
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> | ||
22 | --- | ||
23 | cipher/Makefile.am | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/cipher/Makefile.am b/cipher/Makefile.am | ||
27 | index 95c4510..bd52ec7 100644 | ||
28 | --- a/cipher/Makefile.am | ||
29 | +++ b/cipher/Makefile.am | ||
30 | @@ -116,7 +116,7 @@ gost-s-box: gost-s-box.c | ||
31 | |||
32 | |||
33 | if ENABLE_O_FLAG_MUNGING | ||
34 | -o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' | ||
35 | +o_flag_munging = sed -e 's/ -O\([2-9s][2-9s]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' | ||
36 | else | ||
37 | o_flag_munging = cat | ||
38 | endif | ||
39 | -- | ||
40 | 1.8.3.1 | ||
41 | |||