mirror of
https://git.yoctoproject.org/poky
synced 2026-04-29 09:32:11 +02:00
ceb6a4ecf9
Characters like '-O2' or '-Ofast' will be replaced by '-O1' and '-O0' respectively when compiling cipher and random in the filesystem paths as well if they happen to contain '-O2' or '-Ofast 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 and tabs before the original matching pattern in the sed command. It is difficult to control -O1 for cipher and -O0 for random at the same time in OE environment along with patch file. So, keeping same change as it is. (From OE-Core rev: ecd26bbba36ad715c2a0f20475ebc977ea94746c) Signed-off-by: simit.ghane <simit.ghane@lge.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
71 lines
2.6 KiB
Diff
71 lines
2.6 KiB
Diff
From 7d9817ca935a35fe6c8e2c2c7615825fa08a3a19 Mon Sep 17 00:00:00 2001
|
|
From: "simit.ghane" <simit.ghane@lge.com>
|
|
Date: Tue, 7 May 2024 14:09:03 +0530
|
|
Subject: [PATCHV2] Fix building error with '-O2' in sysroot path
|
|
|
|
Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=7d9817ca935a35fe6c8e2c2c7615825fa08a3a19
|
|
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=e96df0c82e086bf348753d2d0fa37fa6191b4b14
|
|
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=5afadba008918d651afefb842ae123cc18454c74]
|
|
|
|
* cipher/Makefile.am (o_flag_munging): Tweak the sed script.
|
|
* random/Makefile.am (o_flag_munging): Ditto.
|
|
--
|
|
|
|
Characters like '-O2' or '-Ofast' will be replaced by '-O1' and '-O0'
|
|
respectively when compiling cipher and random in the filesystem
|
|
paths as well if they happen to contain '-O2' or '-Ofast
|
|
|
|
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 and tabs before the original matching
|
|
pattern in the sed command.
|
|
|
|
Signed-off-by: simit.ghane <simit.ghane@lge.com>
|
|
|
|
ChangeLog entries added by wk
|
|
|
|
Note that there is also the configure option --disable-O-flag-munging;
|
|
see the README.
|
|
|
|
random:cipher: handle substitution in sed command
|
|
|
|
* cipher/Makefile.am (o_flag_munging): Add 'g' flag for first sed
|
|
expression.
|
|
* random/Makefile.am (o_flag_munging): Likewise.
|
|
|
|
[jk: add changelog to commit message]
|
|
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
|
|
---
|
|
cipher/Makefile.am | 2 +-
|
|
random/Makefile.am | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
|
|
index c3d642b2ac..f1c3971c40 100644
|
|
--- a/cipher/Makefile.am
|
|
+++ b/cipher/Makefile.am
|
|
@@ -153,7 +153,7 @@ gost-s-box: gost-s-box.c
|
|
|
|
|
|
if ENABLE_O_FLAG_MUNGING
|
|
-o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g'
|
|
+o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g'
|
|
else
|
|
o_flag_munging = cat
|
|
endif
|
|
diff --git a/random/Makefile.am b/random/Makefile.am
|
|
index 0c935a0595..340df38a79 100644
|
|
--- a/random/Makefile.am
|
|
+++ b/random/Makefile.am
|
|
@@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h
|
|
|
|
# The rndjent module needs to be compiled without optimization. */
|
|
if ENABLE_O_FLAG_MUNGING
|
|
-o_flag_munging = sed -e 's/-O\([1-9sgz][1-9sgz]*\)/-O0/g' -e 's/-Ofast/-O0/g'
|
|
+o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g'
|
|
else
|
|
o_flag_munging = cat
|
|
endif
|