summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-12-11 17:06:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-14 09:11:16 +0000
commit9b43c57eb2ccc0815ed65843ffb1247633b930e6 (patch)
tree78e527cd5d39eb631f9a997179e03d335bdc3d2c
parent0101c26742288df6a5eaed76989df721991371d6 (diff)
downloadpoky-9b43c57eb2ccc0815ed65843ffb1247633b930e6.tar.gz
libgcrypt: fix compile error with '-O2' in sysroot path
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 whitespaces before and after the original matching pattern in the sed command. [YOCTO #5628] (From OE-Core rev: 84514834417e022660e7b3a540910d2d6fb12337) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch32
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt.inc3
2 files changed, 34 insertions, 1 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
new file mode 100644
index 0000000000..a3e540369c
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
@@ -0,0 +1,32 @@
1Upstream-Status: Pending
2
3libgcrypt: fix building error with '-O2' in sysroot path
4
5Characters like '-O2' or '-Ofast' will be replaced by '-O1' when compiling cipher.
6If we are cross compiling libgcrypt and sysroot contains such characters, we would
7get compile errors because the sysroot path has been modified.
8
9Fix this by adding blank spaces before and after the original matching pattern in the
10sed command.
11
12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13---
14 cipher/Makefile.am | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/cipher/Makefile.am b/cipher/Makefile.am
18index 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--
311.7.9.5
32
diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc
index e0dfec2e06..5ab0c11b6c 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt.inc
+++ b/meta/recipes-support/libgcrypt/libgcrypt.inc
@@ -11,7 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
11DEPENDS = "libgpg-error libcap" 11DEPENDS = "libgpg-error libcap"
12 12
13SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ 13SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
14 file://add-pkgconfig-support.patch" 14 file://add-pkgconfig-support.patch \
15 file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch"
15 16
16inherit autotools binconfig pkgconfig 17inherit autotools binconfig pkgconfig
17 18