Skip to contentSkip to conversation

libgcrypt: fix compile error with '-O2' in sysroot path

PATCH New [email protected] 1 participant 2 messages Dec 11, 2013

lore
Share & tools
lore
#0 lore raw

v2 cover libgcrypt: fix compile error with '-O2' in sysroot path

From: Chen Qi <[email protected]>

Changes since V1:
1. Only patch the Makefile.am.

The following changes since commit d754ddcec78f5e264100ceda854e8412679d6866:

bitbake: process: Add timeout to select call (2013-12-10 17:55:29 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/libgcrypt
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/libgcrypt

Chen Qi (1):
libgcrypt: fix compile error with '-O2' in sysroot path

 ...ix-building-error-with-O2-in-sysroot-path.patch |   32 ++++++++++++++++++++
 meta/recipes-support/libgcrypt/libgcrypt.inc       |    3 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/1 libgcrypt: fix compile error with '-O2' in sysroot path

From: Chen Qi <[email protected]>

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]

---
 ...ix-building-error-with-O2-in-sysroot-path.patch |   32 ++++++++++++++++++++
 meta/recipes-support/libgcrypt/libgcrypt.inc       |    3 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
meta/recipes-support/libgcrypt/files/libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch new file +32 -0
new file mode 100644
index 0000000..a3e5403
@@ -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 <[email protected]>
+---
+ 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
+
meta/recipes-support/libgcrypt/libgcrypt.inc +2 -1
index e0dfec2..5ab0c11 100644
@@ -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
 
Signature · 1 line
1.7.9.5