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 | 19 |
1 files changed, 11 insertions, 8 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 index 0b7abc3a11..502a7aaf32 100644 --- 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 | |||
@@ -1,6 +1,6 @@ | |||
1 | From 326909baf81a638d51fa8be1d8227518784f5cc4 Mon Sep 17 00:00:00 2001 | 1 | From 0377f0d5b5c1079e3b9a80881f4dcc891cbe9f9a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Tue, 14 Sep 2021 12:18:25 +0200 | 3 | Date: Tue, 30 May 2023 09:11:27 -0700 |
4 | Subject: [PATCH] Configure: do not tweak mips cflags | 4 | Subject: [PATCH] Configure: do not tweak mips cflags |
5 | 5 | ||
6 | This conflicts with mips machine definitons from yocto, | 6 | This conflicts with mips machine definitons from yocto, |
@@ -9,20 +9,23 @@ e.g. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 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> | ||
12 | --- | 15 | --- |
13 | Configure | 10 ---------- | 16 | Configure | 10 ---------- |
14 | 1 file changed, 10 deletions(-) | 17 | 1 file changed, 10 deletions(-) |
15 | 18 | ||
16 | Index: openssl-3.0.4/Configure | 19 | diff --git a/Configure b/Configure |
17 | =================================================================== | 20 | index 4569952..adf019b 100755 |
18 | --- openssl-3.0.4.orig/Configure | 21 | --- a/Configure |
19 | +++ openssl-3.0.4/Configure | 22 | +++ b/Configure |
20 | @@ -1423,16 +1423,6 @@ if ($target =~ /^mingw/ && `$config{CC} | 23 | @@ -1422,16 +1422,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m) |
21 | push @{$config{shared_ldflag}}, "-mno-cygwin"; | 24 | push @{$config{shared_ldflag}}, "-mno-cygwin"; |
22 | } | 25 | } |
23 | 26 | ||
24 | -if ($target =~ /linux.*-mips/ && !$disabled{asm} | 27 | -if ($target =~ /linux.*-mips/ && !$disabled{asm} |
25 | - && !grep { $_ !~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { | 28 | - && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { |
26 | - # minimally required architecture flags for assembly modules | 29 | - # minimally required architecture flags for assembly modules |
27 | - my $value; | 30 | - my $value; |
28 | - $value = '-mips2' if ($target =~ /mips32/); | 31 | - $value = '-mips2' if ($target =~ /mips32/); |