blob: 0b7abc3a112345be04487aa7441606f95ec40e3f [file] [log] [blame]
Andrew Geisslereff27472021-10-29 15:35:00 -05001From 326909baf81a638d51fa8be1d8227518784f5cc4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 14 Sep 2021 12:18:25 +0200
4Subject: [PATCH] Configure: do not tweak mips cflags
5
6This conflicts with mips machine definitons from yocto,
7e.g.
8| Error: -mips3 conflicts with the other architecture options, which imply -mips64r2
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12---
13 Configure | 10 ----------
14 1 file changed, 10 deletions(-)
15
Andrew Geissler615f2f12022-07-15 14:00:58 -050016Index: openssl-3.0.4/Configure
17===================================================================
18--- openssl-3.0.4.orig/Configure
19+++ openssl-3.0.4/Configure
20@@ -1423,16 +1423,6 @@ if ($target =~ /^mingw/ && `$config{CC}
Andrew Geisslereff27472021-10-29 15:35:00 -050021 push @{$config{shared_ldflag}}, "-mno-cygwin";
22 }
23
24-if ($target =~ /linux.*-mips/ && !$disabled{asm}
25- && !grep { $_ !~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) {
26- # minimally required architecture flags for assembly modules
27- my $value;
28- $value = '-mips2' if ($target =~ /mips32/);
29- $value = '-mips3' if ($target =~ /mips64/);
30- unshift @{$config{cflags}}, $value;
31- unshift @{$config{cxxflags}}, $value if $config{CXX};
32-}
33-
34 # If threads aren't disabled, check how possible they are
35 unless ($disabled{threads}) {
36 if ($auto_threads) {