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>
This commit is contained in:
parent
0101c26742
commit
9b43c57eb2
|
@ -0,0 +1,32 @@
|
|||
Upstream-Status: Pending
|
||||
|
||||
libgcrypt: fix building 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 blank spaces before and after the original matching pattern in the
|
||||
sed command.
|
||||
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
---
|
||||
cipher/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
|
||||
index 76cdc96..9a89792 100644
|
||||
--- a/cipher/Makefile.am
|
||||
+++ b/cipher/Makefile.am
|
||||
@@ -69,7 +69,7 @@ rfc2268.c \
|
||||
camellia.c camellia.h camellia-glue.c
|
||||
|
||||
if ENABLE_O_FLAG_MUNGING
|
||||
-o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g'
|
||||
+o_flag_munging = sed -e 's/ -O\([2-9s][2-9s]*\) / -O1 /' -e 's/ -Ofast / -O1 /g'
|
||||
else
|
||||
o_flag_munging = cat
|
||||
endif
|
||||
--
|
||||
1.7.9.5
|
||||
|
|
@ -11,7 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
|||
DEPENDS = "libgpg-error libcap"
|
||||
|
||||
SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
|
||||
file://add-pkgconfig-support.patch"
|
||||
file://add-pkgconfig-support.patch \
|
||||
file://libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch"
|
||||
|
||||
inherit autotools binconfig pkgconfig
|
||||
|
||||
|
|
Loading…
Reference in New Issue