summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-11-24 23:50:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-08 23:07:12 (GMT)
commitc3a32fdace034b83818881f03493a26c4e00fe0b (patch)
tree19636203a2fd0dae8fc5b1c4663940a07aef44c3
parent19efe1272fe175dbae2a3c923a8ee270bfd748cf (diff)
downloadpoky-c3a32fdace034b83818881f03493a26c4e00fe0b.tar.gz
boost: fix build for x32
Commit: d336110b94 boost: update to 1.67.0 dropped the patch that ensured boost doesn't over-ride the architecture flags set by us resulting in errors: | build/tmp/work/x86_64_x32-poky-linux-gnux32/boost/1.69.0-r0/recipe-sysroot/usr/include/bits/long-double.h:44:10: fatal error: bits/long-double-64.h: No such file or directory | #include <bits/long-double-64.h> | ^~~~~~~~~~~~~~~~~~~~~~~ | compilation terminated. Remove the relevant part from gcc.jam again to ensure we are passing them correctly again. Fixes [YOCTO #13598] (From OE-Core rev: aad28f42b1c8aa1335c040630ebff4a69be07e35) (From OE-Core rev: 1cfd56ebdbcbab4ded1b0ea3c4bc44d3e83a9288) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit ebbfe23acfbc820ad7b71c95539b5af97a8be49d) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch42
-rw-r--r--meta/recipes-support/boost/boost_1.69.0.bb1
2 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch
new file mode 100644
index 0000000..78b1922
--- /dev/null
+++ b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch
@@ -0,0 +1,42 @@
1From 59402e3a61d14eb7ce8c2019ea1a87ad4bd28605 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 14 Nov 2019 10:13:53 +0800
4Subject: [PATCH] dont setup compiler flags -m32/-m64
5
6We don't want these to be setup by boost as we pass our own flags.
7
8Upstream-Status: Inappropriate [OE-specific]
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 tools/build/src/tools/gcc.jam | 14 --------------
13 1 file changed, 14 deletions(-)
14
15diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
16index c7e3cf3..24486e0 100644
17--- a/tools/build/src/tools/gcc.jam
18+++ b/tools/build/src/tools/gcc.jam
19@@ -430,20 +430,6 @@ local rule compile-link-flags ( * )
20 }
21
22 {
23- # Handle address-model
24- compile-link-flags <target-os>aix/<address-model>32 : -maix32 ;
25- compile-link-flags <target-os>aix/<address-model>64 : -maix64 ;
26-
27- compile-link-flags <target-os>hpux/<address-model>32 : -milp32 ;
28- compile-link-flags <target-os>hpux/<address-model>64 : -mlp64 ;
29-
30- local generic-os = [ set.difference $(all-os) : aix hpux ] ;
31- local arch = power sparc x86 ;
32- compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>32 : -m32 ;
33- compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>64 : -m64 ;
34-}
35-
36-{
37 # Handle threading
38 local rule threading-flags ( * )
39 {
40--
412.7.4
42
diff --git a/meta/recipes-support/boost/boost_1.69.0.bb b/meta/recipes-support/boost/boost_1.69.0.bb
index 324b46f..5e9e0d8 100644
--- a/meta/recipes-support/boost/boost_1.69.0.bb
+++ b/meta/recipes-support/boost/boost_1.69.0.bb
@@ -6,4 +6,5 @@ SRC_URI += "file://arm-intrinsics.patch \
6 file://boost-math-disable-pch-for-gcc.patch \ 6 file://boost-math-disable-pch-for-gcc.patch \
7 file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ 7 file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \
8 file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ 8 file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
9 file://0001-dont-setup-compiler-flags-m32-m64.patch \
9 " 10 "