libgcrypt: fix compile error with '-O2' in sysroot path
cover libgcrypt: fix compile error with '-O2' in sysroot path
From: Chen Qi <[email protected]>
The following changes since commit c51730aaa91066cfb51ad6ec2920fb4f9d9ea94c:
bitbake: Hob: check if warnings are related to package build (2013-12-03 17:45:54 +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
...fix-compile-error-with-O2-in-sysroot-path.patch | 46 ++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt.inc | 3 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch
Signature · 1 line
1.7.9.5
PATCH 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]
--- ...fix-compile-error-with-O2-in-sysroot-path.patch | 46 ++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt.inc | 3 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch
meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch new file +46 -0
@@ -0,0 +1,46 @@ +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 +- + cipher/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +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 +diff --git a/cipher/Makefile.in b/cipher/Makefile.in +index 1394d15..6080d59 100644 +--- a/cipher/Makefile.in ++++ b/cipher/Makefile.in +@@ -314,7 +314,7 @@ rfc2268.c \ + camellia.c camellia.h camellia-glue.c + + @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat +-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' ++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/ -O\([2-9s][2-9s]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' + all: all-am + + .SUFFIXES: +-- +1.7.9.5 +
meta/recipes-support/libgcrypt/libgcrypt.inc +2 -1
@@ -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://fix-compile-error-with-O2-in-sysroot-path.patch" inherit autotools binconfig pkgconfig
Signature · 1 line
1.7.9.5
Quoted 49 lines · On 12/05/2013 12:55 AM, [email protected] wrote:
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]
Signed-off-by Chen Qi <[email protected]>--- ...fix-compile-error-with-O2-in-sysroot-path.patch | 46 ++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt.inc | 3 +- 2 files changed, 48 insertions(+), 1 deletion(-)create mode 100644
meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patchmeta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch new file +24
-0@@ -0,0 +1,46 @@ +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 +- + cipher/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +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 +
meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch line 34
Quoted 10 lines
meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch new file +10
-0+ 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 +diff --git a/cipher/Makefile.in b/cipher/Makefile.in +index 1394d15..6080d59 100644 +--- a/cipher/Makefile.in ++++ b/cipher/Makefile.in
Why do we need to patch Makefile.in if we are already patching the Makefile.am which will re-generate the Makefile.in
Sau!
Quoted 27 lines
meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch new file +12
-0+@@ -314,7 +314,7 @@ rfc2268.c \ + camellia.c camellia.h camellia-glue.c + + @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat +-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' ++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/ -O\([2-9s][2-9s]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' + all: all-am + + .SUFFIXES: +-- +1.7.9.5 +meta/recipes-support/libgcrypt/libgcrypt.inc +2
-1@@ -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://fix-compile-error-with-O2-in-sysroot-path.patch" inherit autotools binconfig pkgconfig
Quoted 72 lines · Saul Wold
Quoted 60 lines · On 12/05/2013 12:55 AM, [email protected] wrote:
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]
Signed-off-by Chen Qi <[email protected]>--- ...fix-compile-error-with-O2-in-sysroot-path.patch | 46 ++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt.inc | 3 +- 2 files changed, 48 insertions(+), 1 deletion(-)create mode 100644
meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patchmeta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch +0
-0new file mode 100644
index 0000000..6b1f119
---/dev/null
+++b/meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patchmeta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch +5
-0@@ -0,0 +1,46 @@ +Upstream-Status: Pending + +libgcrypt: fix building error with '-O2' in sysroot path + +Characters like '-O2' or '-Ofast' will be replaced by '-O1' whencompiling cipher.
+If we are cross compiling libgcrypt and sysroot contains such characters, we wouldmeta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch +3
-0+get compile errors because the sysroot path has been modified. + +Fix this by adding blank spaces before and after the originalmatching pattern in the
meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch +17
-0+sed command. + +Signed-off-by: Chen Qi <[email protected]> +--- + cipher/Makefile.am | 2 +- + cipher/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +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/meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch line 34
Quoted 8 lines
meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch +7
-1-Ofast / -O1 /g' + else + o_flag_munging = cat + endif +diff --git a/cipher/Makefile.in b/cipher/Makefile.in +index 1394d15..6080d59 100644 +--- a/cipher/Makefile.in ++++ b/cipher/Makefile.inWhy do we need to patch Makefile.in if we are already patching the Makefile.am which will re-generate the Makefile.in
Quoted 2 lines
Sau!
I thought it would do no harm. And I will send this patch to upstream, so it might be a little strange that I only modify the Makefile.am file even if Makefile.in has the same problem.
Best Regards,
Chen Qi
Quoted 33 lines
Quoted 31 lines
+@@ -314,7 +314,7 @@
rfc2268.c\
+camellia.ccamellia.hcamellia-glue.c
+
+ @ENABLE_O_FLAG_MUNGING_FALSE@o_flag_munging = cat +-@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g' ++@ENABLE_O_FLAG_MUNGING_TRUE@o_flag_munging = sed -e 's/meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch +6
-1-O\([2-9s][2-9s]*\) / -O1 /' -e 's/ -Ofast / -O1 /g' + all: all-am + + .SUFFIXES: +-- +1.7.9.5 +meta/recipes-support/libgcrypt/libgcrypt.inc +2
-1@@ -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://fix-compile-error-with-O2-in-sysroot-path.patch"inherit autotools binconfig pkgconfig
Quoted 76 lines · ChenQi
Quoted 75 lines · Saul Wold
Quoted 62 lines · On 12/05/2013 12:55 AM, [email protected] wrote:
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]
Signed-off-by Chen Qi <[email protected]>--- ...fix-compile-error-with-O2-in-sysroot-path.patch | 46 ++++++++++++++++++++ meta/recipes-support/libgcrypt/libgcrypt.inc | 3 +- 2 files changed, 48 insertions(+), 1 deletion(-)create mode 100644
meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch(quoted diff) +0
-0
a/meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patchb/meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patchnew file mode 100644
index 0000000..6b1f119
---/dev/null
+++b/meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patchmeta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch new file +5
-0@@ -0,0 +1,46 @@ +Upstream-Status: Pending + +libgcrypt: fix building error with '-O2' in sysroot path + +Characters like '-O2' or '-Ofast' will be replaced by '-O1' whencompiling cipher.
+If we are cross compiling libgcrypt and sysroot contains such characters, we wouldmeta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch new file +3
-0+get compile errors because the sysroot path has been modified. + +Fix this by adding blank spaces before and after the originalmatching pattern in the
meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch new file +17
-0+sed command. + +Signed-off-by: Chen Qi <[email protected]> +--- + cipher/Makefile.am | 2 +- + cipher/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +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/meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch line 34
Quoted 8 lines
meta/recipes-support/libgcrypt/files/fix-compile-error-with-O2-in-sysroot-path.patch new file +7
-1-Ofast / -O1 /g' + else + o_flag_munging = cat + endif +diff --git a/cipher/Makefile.in b/cipher/Makefile.in +index 1394d15..6080d59 100644 +--- a/cipher/Makefile.in ++++ b/cipher/Makefile.inWhy do we need to patch Makefile.in if we are already patching the Makefile.am which will re-generate the Makefile.in
Quoted 6 lines
Quoted 2 lines
Sau!
I thought it would do no harm. And I will send this patch to upstream, so it might be a little strange that I only modify the Makefile.am file even if Makefile.in has the same problem.
It can actually be harmful since the modification time of Makefile.in can be after the time for Makefile.am and things can go "very wrong" with autotools when that happens :(
Cheers,
Richard
Quoted 7 lines · Richard Purdie
Quoted 3 lines
I thought it would do no harm. And I will send this patch to upstream, so it might be a little strange that I only modify the Makefile.am file even if Makefile.in has the same problem.
It can actually be harmful since the modification time of Makefile.in can be after the time for Makefile.am and things can go "very wrong" with autotools when that happens :(
Another good reason not to modify the Makefile.in is that being a generated file, updating automake can change how it is generated, so the patch doesn't apply anymore.
Ross
Quoted 5 lines · Ross
Quoted 3 lines · Richard Purdie
Quoted 3 lines
I thought it would do no harm. And I will send this patch to upstream, so it might be a little strange that I only modify the Makefile.am file even if Makefile.in has the same problem.
Quoted 10 lines
Quoted 3 lines
It can actually be harmful since the modification time of Makefile.in can be after the time for Makefile.am and things can go "very wrong" with autotools when that happens :(
Another good reason not to modify the Makefile.in is that being a generated file, updating automake can change how it is generated, so the patch doesn't apply anymore.
Ross
Hi All,
Thanks for your explanation. I'll send out a V2.
Best Regards,
Chen Qi