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 | 39 |
1 files changed, 39 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..502a7aaf32 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 0377f0d5b5c1079e3b9a80881f4dcc891cbe9f9a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 30 May 2023 09:11:27 -0700 | ||
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 | |||
13 | Refreshed for openssl-3.1.1 | ||
14 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | ||
15 | --- | ||
16 | Configure | 10 ---------- | ||
17 | 1 file changed, 10 deletions(-) | ||
18 | |||
19 | diff --git a/Configure b/Configure | ||
20 | index 4569952..adf019b 100755 | ||
21 | --- a/Configure | ||
22 | +++ b/Configure | ||
23 | @@ -1422,16 +1422,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m) | ||
24 | push @{$config{shared_ldflag}}, "-mno-cygwin"; | ||
25 | } | ||
26 | |||
27 | -if ($target =~ /linux.*-mips/ && !$disabled{asm} | ||
28 | - && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { | ||
29 | - # minimally required architecture flags for assembly modules | ||
30 | - my $value; | ||
31 | - $value = '-mips2' if ($target =~ /mips32/); | ||
32 | - $value = '-mips3' if ($target =~ /mips64/); | ||
33 | - unshift @{$config{cflags}}, $value; | ||
34 | - unshift @{$config{cxxflags}}, $value if $config{CXX}; | ||
35 | -} | ||
36 | - | ||
37 | # If threads aren't disabled, check how possible they are | ||
38 | unless ($disabled{threads}) { | ||
39 | if ($auto_threads) { | ||