diff options
Diffstat (limited to 'meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch')
-rw-r--r-- | meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch | 97 |
1 files changed, 97 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch b/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch new file mode 100644 index 0000000000..e9c7e4c555 --- /dev/null +++ b/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch | |||
@@ -0,0 +1,97 @@ | |||
1 | From c0e785f8da2caa6617052b1c7b347e0dffb1520d Mon Sep 17 00:00:00 2001 | ||
2 | From: Christopher Larson <chris_larson@mentor.com> | ||
3 | Date: Tue, 13 Dec 2016 10:29:17 -0700 | ||
4 | Subject: [PATCH 2/3] Don't set up -m32/-m64, we do that ourselves | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
8 | --- | ||
9 | tools/build/src/tools/gcc.jam | 10 ---------- | ||
10 | 1 file changed, 10 deletions(-) | ||
11 | |||
12 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam | ||
13 | index 0f346a5..942f141 100644 | ||
14 | --- a/tools/build/src/tools/gcc.jam | ||
15 | +++ b/tools/build/src/tools/gcc.jam | ||
16 | @@ -509,7 +509,6 @@ rule compile.c++.pch ( targets * : sources * : properties * ) | ||
17 | { | ||
18 | setup-threading $(targets) : $(sources) : $(properties) ; | ||
19 | setup-fpic $(targets) : $(sources) : $(properties) ; | ||
20 | - setup-address-model $(targets) : $(sources) : $(properties) ; | ||
21 | } | ||
22 | |||
23 | actions compile.c++.pch | ||
24 | @@ -521,7 +520,6 @@ rule compile.c.pch ( targets * : sources * : properties * ) | ||
25 | { | ||
26 | setup-threading $(targets) : $(sources) : $(properties) ; | ||
27 | setup-fpic $(targets) : $(sources) : $(properties) ; | ||
28 | - setup-address-model $(targets) : $(sources) : $(properties) ; | ||
29 | } | ||
30 | |||
31 | actions compile.c.pch | ||
32 | @@ -533,7 +531,6 @@ rule compile.c++.preprocess ( targets * : sources * : properties * ) | ||
33 | { | ||
34 | setup-threading $(targets) : $(sources) : $(properties) ; | ||
35 | setup-fpic $(targets) : $(sources) : $(properties) ; | ||
36 | - setup-address-model $(targets) : $(sources) : $(properties) ; | ||
37 | |||
38 | # Some extensions are compiled as C++ by default. For others, we need to | ||
39 | # pass -x c++. We could always pass -x c++ but distcc does not work with it. | ||
40 | @@ -548,7 +545,6 @@ rule compile.c.preprocess ( targets * : sources * : properties * ) | ||
41 | { | ||
42 | setup-threading $(targets) : $(sources) : $(properties) ; | ||
43 | setup-fpic $(targets) : $(sources) : $(properties) ; | ||
44 | - setup-address-model $(targets) : $(sources) : $(properties) ; | ||
45 | |||
46 | # If we use the name g++ then default file suffix -> language mapping does | ||
47 | # not work. So have to pass -x option. Maybe, we can work around this by | ||
48 | @@ -564,7 +560,6 @@ rule compile.c++ ( targets * : sources * : properties * ) | ||
49 | { | ||
50 | setup-threading $(targets) : $(sources) : $(properties) ; | ||
51 | setup-fpic $(targets) : $(sources) : $(properties) ; | ||
52 | - setup-address-model $(targets) : $(sources) : $(properties) ; | ||
53 | |||
54 | # Some extensions are compiled as C++ by default. For others, we need to | ||
55 | # pass -x c++. We could always pass -x c++ but distcc does not work with it. | ||
56 | @@ -594,7 +589,6 @@ rule compile.c ( targets * : sources * : properties * ) | ||
57 | { | ||
58 | setup-threading $(targets) : $(sources) : $(properties) ; | ||
59 | setup-fpic $(targets) : $(sources) : $(properties) ; | ||
60 | - setup-address-model $(targets) : $(sources) : $(properties) ; | ||
61 | |||
62 | # If we use the name g++ then default file suffix -> language mapping does | ||
63 | # not work. So have to pass -x option. Maybe, we can work around this by | ||
64 | @@ -610,7 +604,6 @@ rule compile.fortran ( targets * : sources * : properties * ) | ||
65 | { | ||
66 | setup-threading $(targets) : $(sources) : $(properties) ; | ||
67 | setup-fpic $(targets) : $(sources) : $(properties) ; | ||
68 | - setup-address-model $(targets) : $(sources) : $(properties) ; | ||
69 | } | ||
70 | |||
71 | actions compile.c++ bind PCH_FILE | ||
72 | @@ -641,7 +634,6 @@ actions compile.fortran | ||
73 | rule compile.asm ( targets * : sources * : properties * ) | ||
74 | { | ||
75 | setup-fpic $(targets) : $(sources) : $(properties) ; | ||
76 | - setup-address-model $(targets) : $(sources) : $(properties) ; | ||
77 | LANG on $(<) = "-x assembler-with-cpp" ; | ||
78 | } | ||
79 | |||
80 | @@ -950,7 +942,6 @@ rule quote-rpath ( targets * ) | ||
81 | rule link ( targets * : sources * : properties * ) | ||
82 | { | ||
83 | setup-threading $(targets) : $(sources) : $(properties) ; | ||
84 | - setup-address-model $(targets) : $(sources) : $(properties) ; | ||
85 | SPACE on $(targets) = " " ; | ||
86 | # Serialize execution of the 'link' action, since running N links in | ||
87 | # parallel is just slower. For now, serialize only gcc links, it might be a | ||
88 | @@ -1018,7 +1009,6 @@ actions piecemeal archive | ||
89 | rule link.dll ( targets * : sources * : properties * ) | ||
90 | { | ||
91 | setup-threading $(targets) : $(sources) : $(properties) ; | ||
92 | - setup-address-model $(targets) : $(sources) : $(properties) ; | ||
93 | SPACE on $(targets) = " " ; | ||
94 | JAM_SEMAPHORE on $(targets) = <s>gcc-link-semaphore ; | ||
95 | quote-rpath $(targets) ; | ||
96 | -- | ||
97 | 2.8.0 | ||