mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
boost: update to 1.66.0
Rework 0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch to remove the offending bits from the function instead of removing calls to the function all over the place. (From OE-Core rev: 18e94bc08db55afb2d9b9db9a51c6a2d5478c056) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
e84b1b6358
commit
b112b094cc
+2
-2
@@ -12,8 +12,8 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
|
||||
BOOST_P = "boost_${BOOST_VER}"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2"
|
||||
SRC_URI[md5sum] = "41d7542ce40e171f3f7982aff008ff0d"
|
||||
SRC_URI[sha256sum] = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"
|
||||
SRC_URI[md5sum] = "b2dfbd6c717be4a7bb2d88018eaccf75"
|
||||
SRC_URI[sha256sum] = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
|
||||
|
||||
UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
|
||||
UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/"
|
||||
-28
@@ -1,28 +0,0 @@
|
||||
From 02fa5cee1b8d0321787113e2dc10b162c657f333 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Ramey <ramey@rrsd.com>
|
||||
Date: Wed, 1 Feb 2017 16:43:59 -0800
|
||||
Subject: [PATCH] correct error which appeared when compiling non c++ compliant
|
||||
code for arrays
|
||||
|
||||
Upstream-Status: Backport [expected to be released in v1.65]
|
||||
|
||||
---
|
||||
boost/serialization/array.hpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/boost/serialization/array.hpp b/boost/serialization/array.hpp
|
||||
index 61708b3..612d1a6 100644
|
||||
--- a/boost/serialization/array.hpp
|
||||
+++ b/boost/serialization/array.hpp
|
||||
@@ -23,6 +23,8 @@ namespace std{
|
||||
} // namespace std
|
||||
#endif
|
||||
|
||||
+#include <boost/serialization/array_wrapper.hpp>
|
||||
+
|
||||
#ifndef BOOST_NO_CXX11_HDR_ARRAY
|
||||
|
||||
#include <array>
|
||||
--
|
||||
2.9.3
|
||||
|
||||
+53
-85
@@ -1,97 +1,65 @@
|
||||
From c0e785f8da2caa6617052b1c7b347e0dffb1520d Mon Sep 17 00:00:00 2001
|
||||
From e4d3a7470b307693660d0412732e7266d1738d8c Mon Sep 17 00:00:00 2001
|
||||
From: Christopher Larson <chris_larson@mentor.com>
|
||||
Date: Tue, 13 Dec 2016 10:29:17 -0700
|
||||
Subject: [PATCH 2/3] Don't set up -m32/-m64, we do that ourselves
|
||||
Subject: [PATCH 6/6] Don't set up -m32/-m64, we do that ourselves
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
|
||||
|
||||
---
|
||||
tools/build/src/tools/gcc.jam | 10 ----------
|
||||
1 file changed, 10 deletions(-)
|
||||
tools/build/src/tools/gcc.jam | 39 ---------------------------------------
|
||||
1 file changed, 39 deletions(-)
|
||||
|
||||
diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
|
||||
index 0f346a5..942f141 100644
|
||||
index e4fc6c32..37914fd0 100644
|
||||
--- a/tools/build/src/tools/gcc.jam
|
||||
+++ b/tools/build/src/tools/gcc.jam
|
||||
@@ -509,7 +509,6 @@ rule compile.c++.pch ( targets * : sources * : properties * )
|
||||
{
|
||||
setup-threading $(targets) : $(sources) : $(properties) ;
|
||||
setup-fpic $(targets) : $(sources) : $(properties) ;
|
||||
- setup-address-model $(targets) : $(sources) : $(properties) ;
|
||||
@@ -337,45 +337,6 @@ rule set-address-model-options ( targets * : sources * : properties * )
|
||||
{
|
||||
local option ;
|
||||
local target-os = [ feature.get-values target-os : $(properties) ] ;
|
||||
- if $(target-os) = aix
|
||||
- {
|
||||
- if $(model) = 32
|
||||
- {
|
||||
- option = -maix32 ;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- option = -maix64 ;
|
||||
- }
|
||||
- }
|
||||
- else if $(target-os) = hpux
|
||||
- {
|
||||
- if $(model) = 32
|
||||
- {
|
||||
- option = -milp32 ;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- option = -mlp64 ;
|
||||
- }
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- local arch = [ feature.get-values architecture : $(properties) ] ;
|
||||
- if $(arch) = power || $(arch) = sparc || $(arch) = x86
|
||||
- {
|
||||
- if $(model) = 32
|
||||
- {
|
||||
- option = -m32 ;
|
||||
- }
|
||||
- else if $(model) = 64
|
||||
- {
|
||||
- option = -m64 ;
|
||||
- }
|
||||
- }
|
||||
- # For darwin, the model can be 32_64. darwin.jam will handle that
|
||||
- # on its own.
|
||||
- }
|
||||
OPTIONS on $(targets) += $(option) ;
|
||||
}
|
||||
}
|
||||
|
||||
actions compile.c++.pch
|
||||
@@ -521,7 +520,6 @@ rule compile.c.pch ( targets * : sources * : properties * )
|
||||
{
|
||||
setup-threading $(targets) : $(sources) : $(properties) ;
|
||||
setup-fpic $(targets) : $(sources) : $(properties) ;
|
||||
- setup-address-model $(targets) : $(sources) : $(properties) ;
|
||||
}
|
||||
|
||||
actions compile.c.pch
|
||||
@@ -533,7 +531,6 @@ rule compile.c++.preprocess ( targets * : sources * : properties * )
|
||||
{
|
||||
setup-threading $(targets) : $(sources) : $(properties) ;
|
||||
setup-fpic $(targets) : $(sources) : $(properties) ;
|
||||
- setup-address-model $(targets) : $(sources) : $(properties) ;
|
||||
|
||||
# Some extensions are compiled as C++ by default. For others, we need to
|
||||
# pass -x c++. We could always pass -x c++ but distcc does not work with it.
|
||||
@@ -548,7 +545,6 @@ rule compile.c.preprocess ( targets * : sources * : properties * )
|
||||
{
|
||||
setup-threading $(targets) : $(sources) : $(properties) ;
|
||||
setup-fpic $(targets) : $(sources) : $(properties) ;
|
||||
- setup-address-model $(targets) : $(sources) : $(properties) ;
|
||||
|
||||
# If we use the name g++ then default file suffix -> language mapping does
|
||||
# not work. So have to pass -x option. Maybe, we can work around this by
|
||||
@@ -564,7 +560,6 @@ rule compile.c++ ( targets * : sources * : properties * )
|
||||
{
|
||||
setup-threading $(targets) : $(sources) : $(properties) ;
|
||||
setup-fpic $(targets) : $(sources) : $(properties) ;
|
||||
- setup-address-model $(targets) : $(sources) : $(properties) ;
|
||||
|
||||
# Some extensions are compiled as C++ by default. For others, we need to
|
||||
# pass -x c++. We could always pass -x c++ but distcc does not work with it.
|
||||
@@ -594,7 +589,6 @@ rule compile.c ( targets * : sources * : properties * )
|
||||
{
|
||||
setup-threading $(targets) : $(sources) : $(properties) ;
|
||||
setup-fpic $(targets) : $(sources) : $(properties) ;
|
||||
- setup-address-model $(targets) : $(sources) : $(properties) ;
|
||||
|
||||
# If we use the name g++ then default file suffix -> language mapping does
|
||||
# not work. So have to pass -x option. Maybe, we can work around this by
|
||||
@@ -610,7 +604,6 @@ rule compile.fortran ( targets * : sources * : properties * )
|
||||
{
|
||||
setup-threading $(targets) : $(sources) : $(properties) ;
|
||||
setup-fpic $(targets) : $(sources) : $(properties) ;
|
||||
- setup-address-model $(targets) : $(sources) : $(properties) ;
|
||||
}
|
||||
|
||||
actions compile.c++ bind PCH_FILE
|
||||
@@ -641,7 +634,6 @@ actions compile.fortran
|
||||
rule compile.asm ( targets * : sources * : properties * )
|
||||
{
|
||||
setup-fpic $(targets) : $(sources) : $(properties) ;
|
||||
- setup-address-model $(targets) : $(sources) : $(properties) ;
|
||||
LANG on $(<) = "-x assembler-with-cpp" ;
|
||||
}
|
||||
|
||||
@@ -950,7 +942,6 @@ rule quote-rpath ( targets * )
|
||||
rule link ( targets * : sources * : properties * )
|
||||
{
|
||||
setup-threading $(targets) : $(sources) : $(properties) ;
|
||||
- setup-address-model $(targets) : $(sources) : $(properties) ;
|
||||
SPACE on $(targets) = " " ;
|
||||
# Serialize execution of the 'link' action, since running N links in
|
||||
# parallel is just slower. For now, serialize only gcc links, it might be a
|
||||
@@ -1018,7 +1009,6 @@ actions piecemeal archive
|
||||
rule link.dll ( targets * : sources * : properties * )
|
||||
{
|
||||
setup-threading $(targets) : $(sources) : $(properties) ;
|
||||
- setup-address-model $(targets) : $(sources) : $(properties) ;
|
||||
SPACE on $(targets) = " " ;
|
||||
JAM_SEMAPHORE on $(targets) = <s>gcc-link-semaphore ;
|
||||
quote-rpath $(targets) ;
|
||||
--
|
||||
2.8.0
|
||||
2.15.1
|
||||
|
||||
|
||||
+15
-7
@@ -1,20 +1,21 @@
|
||||
From 7c49525812567f1219706c4ed330b3bd2cc8e94a Mon Sep 17 00:00:00 2001
|
||||
From 0868761e7d2d75d472090e3ef96f3d2f9ced27f3 Mon Sep 17 00:00:00 2001
|
||||
From: Christopher Larson <chris_larson@mentor.com>
|
||||
Date: Tue, 13 Dec 2016 10:29:32 -0700
|
||||
Subject: [PATCH 3/3] Don't set up arch/instruction-set flags, we do that
|
||||
Subject: [PATCH 5/6] Don't set up arch/instruction-set flags, we do that
|
||||
ourselves
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
|
||||
|
||||
---
|
||||
tools/build/src/tools/gcc.jam | 121 ------------------------------------------
|
||||
1 file changed, 121 deletions(-)
|
||||
tools/build/src/tools/gcc.jam | 127 ------------------------------------------
|
||||
1 file changed, 127 deletions(-)
|
||||
|
||||
diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
|
||||
index 942f141..d062c20 100644
|
||||
index e3b1b952..e4fc6c32 100644
|
||||
--- a/tools/build/src/tools/gcc.jam
|
||||
+++ b/tools/build/src/tools/gcc.jam
|
||||
@@ -1068,124 +1068,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
|
||||
@@ -1276,130 +1276,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
|
||||
<architecture>$(architecture)/<instruction-set>$(instruction-set)
|
||||
: $(values) ;
|
||||
}
|
||||
@@ -60,6 +61,10 @@ index 942f141..d062c20 100644
|
||||
-cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ;
|
||||
-cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ;
|
||||
-cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ;
|
||||
-cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ;
|
||||
-cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ;
|
||||
-cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ;
|
||||
-cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
|
||||
@@ -81,8 +86,10 @@ index 942f141..d062c20 100644
|
||||
-cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ;
|
||||
-cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ;
|
||||
@@ -140,4 +147,5 @@ index 942f141..d062c20 100644
|
||||
-# AIX variant of RS/6000 & PowerPC
|
||||
-toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
|
||||
--
|
||||
2.8.0
|
||||
2.15.1
|
||||
|
||||
|
||||
-1
@@ -8,5 +8,4 @@ SRC_URI += "\
|
||||
file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \
|
||||
file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
|
||||
file://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \
|
||||
file://0001-correct-error-which-appeared-when-compiling-non-c-co.patch \
|
||||
"
|
||||
Reference in New Issue
Block a user