Merge pull request #18262 from TDT-AG/pr/20220406-strongswan
[feed/packages.git] / libs / boost / patches / 030-mips1.patch
1 --- a/boostcpp.jam
2 +++ b/boostcpp.jam
3 @@ -634,7 +634,7 @@ rule address-model ( )
4 return <conditional>@boostcpp.deduce-address-model ;
5 }
6
7 -local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ;
8 +local deducable-architectures = arm mips power riscv s390x sparc x86 combined ;
9 feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ;
10 for a in $(deducable-architectures)
11 {
12 @@ -645,10 +645,10 @@ rule deduce-architecture ( properties *
13 {
14 local result ;
15 local filtered = [ toolset-properties $(properties) ] ;
16 - local names = arm mips1 power riscv s390x sparc x86 combined ;
17 + local names = arm mips power riscv s390x sparc x86 combined ;
18 local idx = [ configure.find-builds "default architecture" : $(filtered)
19 : /boost/architecture//arm
20 - : /boost/architecture//mips1
21 + : /boost/architecture//mips
22 : /boost/architecture//power
23 : /boost/architecture//riscv
24 : /boost/architecture//s390x
25 --- a/libs/atomic/build/atomic-arch-config.jam
26 +++ b/libs/atomic/build/atomic-arch-config.jam
27 @@ -27,9 +27,9 @@ rule deduce-architecture ( properties *
28 {
29 return arm ;
30 }
31 - else if [ configure.builds /boost/architecture//mips1 : $(properties) : "mips1" ]
32 + else if [ configure.builds /boost/architecture//mips : $(properties) : "mips" ]
33 {
34 - return mips1 ;
35 + return mips ;
36 }
37 else if [ configure.builds /boost/architecture//power : $(properties) : "power" ]
38 {
39 --- a/libs/config/checks/architecture/Jamfile.jam
40 +++ b/libs/config/checks/architecture/Jamfile.jam
41 @@ -18,7 +18,7 @@ obj 64 : 64.cpp ;
42
43 obj arm : arm.cpp ;
44 obj combined : combined.cpp ;
45 -obj mips1 : mips1.cpp ;
46 +obj mips : mips1.cpp ;
47 obj power : power.cpp ;
48 obj riscv : riscv.cpp ;
49 obj sparc : sparc.cpp ;
50 --- a/libs/log/build/log-arch-config.jam
51 +++ b/libs/log/build/log-arch-config.jam
52 @@ -56,9 +56,9 @@ rule deduce-architecture ( properties *
53 {
54 return arm ;
55 }
56 - else if [ configure.builds /boost/architecture//mips1 : $(properties) : mips1 ]
57 + else if [ configure.builds /boost/architecture//mips : $(properties) : mips ]
58 {
59 - return mips1 ;
60 + return mips ;
61 }
62 else if [ configure.builds /boost/architecture//power : $(properties) : power ]
63 {