diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch new file mode 100644 index 0000000000..b3f6a942d5 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 326909baf81a638d51fa8be1d8227518784f5cc4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 14 Sep 2021 12:18:25 +0200 | ||
4 | Subject: [PATCH] Configure: do not tweak mips cflags | ||
5 | |||
6 | This conflicts with mips machine definitons from yocto, | ||
7 | e.g. | ||
8 | | Error: -mips3 conflicts with the other architecture options, which imply -mips64r2 | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
13 | --- | ||
14 | Configure | 10 ---------- | ||
15 | 1 file changed, 10 deletions(-) | ||
16 | |||
17 | Index: openssl-3.0.4/Configure | ||
18 | =================================================================== | ||
19 | --- openssl-3.0.4.orig/Configure | ||
20 | +++ openssl-3.0.4/Configure | ||
21 | @@ -1243,16 +1243,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m) | ||
22 | push @{$config{shared_ldflag}}, "-mno-cygwin"; | ||
23 | } | ||
24 | |||
25 | -if ($target =~ /linux.*-mips/ && !$disabled{asm} | ||
26 | - && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { | ||
27 | - # minimally required architecture flags for assembly modules | ||
28 | - my $value; | ||
29 | - $value = '-mips2' if ($target =~ /mips32/); | ||
30 | - $value = '-mips3' if ($target =~ /mips64/); | ||
31 | - unshift @{$config{cflags}}, $value; | ||
32 | - unshift @{$config{cxxflags}}, $value if $config{CXX}; | ||
33 | -} | ||
34 | - | ||
35 | # If threads aren't disabled, check how possible they are | ||
36 | unless ($disabled{threads}) { | ||
37 | if ($auto_threads) { | ||