mirror of
https://git.yoctoproject.org/poky
synced 2026-02-15 21:23:04 +01:00
31421cc447
Drop backports. Add a patch that inserts missing spaces in Makefiles. Drop determinism.patch: upstream has moved the git stuff to an external script, which has a guard that checkes for presence of .git/ in source tree. License-Update: additional source file listed (From OE-Core rev: ad2eae801c7809db3f4830f19efdad78d1a62d59) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 3c6c10eae0993c8ca60879494c6650f7b8f54ebe Mon Sep 17 00:00:00 2001
|
|
From: Chen Qi <Qi.Chen@windriver.com>
|
|
Date: Wed, 16 Aug 2017 10:44:41 +0800
|
|
Subject: [PATCH] libgcrypt: fix building error with '-O2' in sysroot path
|
|
|
|
Upstream-Status: Pending
|
|
|
|
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>
|
|
|
|
Rebase to 1.8.0
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
|
|
---
|
|
cipher/Makefile.am | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
|
|
index d644005..1cf5072 100644
|
|
--- a/cipher/Makefile.am
|
|
+++ b/cipher/Makefile.am
|
|
@@ -147,7 +147,7 @@ gost-s-box: gost-s-box.c
|
|
|
|
|
|
if ENABLE_O_FLAG_MUNGING
|
|
-o_flag_munging = sed -e 's/-O\([2-9sg][2-9sg]*\)/-O1/' -e 's/-Ofast/-O1/g'
|
|
+o_flag_munging = sed -e 's/ -O\([2-9sg][2-9sg]*\) / -O1 /' -e 's/ -Ofast / -O1 /g'
|
|
else
|
|
o_flag_munging = cat
|
|
endif
|