mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
boost: update 1.74.0 -> 1.75.0
Remove 0001-Apply-boost-1.62.0-no-forced-flags.patch.patch: upstream has refactored the code, purpose of the patch is unclear. (From OE-Core rev: fe931dbdb6eebf99e5f034d4b530387066486f4c) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
df0bb1cb96
commit
cf8a40e6c4
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
|
||||
BOOST_P = "boost_${BOOST_VER}"
|
||||
|
||||
SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2"
|
||||
SRC_URI[sha256sum] = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1"
|
||||
SRC_URI[sha256sum] = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb"
|
||||
|
||||
UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
|
||||
UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/"
|
||||
@@ -1,100 +0,0 @@
|
||||
From 8845a786598f1d9e83aa1b7d2966b0d1eb765ba0 Mon Sep 17 00:00:00 2001
|
||||
From: Christopher Larson <chris_larson@mentor.com>
|
||||
Date: Tue, 13 Dec 2016 10:14:31 -0700
|
||||
Subject: [PATCH 1/3] Apply boost-1.62.0-no-forced-flags.patch
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
|
||||
---
|
||||
libs/log/build/Jamfile.v2 | 4 ++--
|
||||
libs/log/config/x86-ext/Jamfile.jam | 16 ++++++++--------
|
||||
libs/log/src/dump_avx2.cpp | 4 ++++
|
||||
libs/log/src/dump_ssse3.cpp | 4 ++++
|
||||
4 files changed, 18 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/libs/log/build/Jamfile.v2 b/libs/log/build/Jamfile.v2
|
||||
index 4abbdbc..b3016fc 100644
|
||||
--- a/libs/log/build/Jamfile.v2
|
||||
+++ b/libs/log/build/Jamfile.v2
|
||||
@@ -373,7 +373,7 @@ rule avx2-targets-cond ( properties * )
|
||||
}
|
||||
else if <toolset>clang in $(properties)
|
||||
{
|
||||
- result = <cxxflags>"-mavx -mavx2" ;
|
||||
+ result = <cxxflags> ;
|
||||
}
|
||||
else if <toolset>intel in $(properties)
|
||||
{
|
||||
@@ -383,7 +383,7 @@ rule avx2-targets-cond ( properties * )
|
||||
}
|
||||
else
|
||||
{
|
||||
- result = <cxxflags>"-xCORE-AVX2 -fabi-version=0" ;
|
||||
+ result = <cxxflags>"-fabi-version=0" ;
|
||||
}
|
||||
}
|
||||
else if <toolset>msvc in $(properties)
|
||||
diff --git a/libs/log/config/x86-ext/Jamfile.jam b/libs/log/config/x86-ext/Jamfile.jam
|
||||
index 0e9695a..dcc394d 100644
|
||||
--- a/libs/log/config/x86-ext/Jamfile.jam
|
||||
+++ b/libs/log/config/x86-ext/Jamfile.jam
|
||||
@@ -15,19 +15,19 @@ project /boost/log/x86-extensions
|
||||
|
||||
obj ssse3 : ssse3.cpp
|
||||
:
|
||||
- <toolset>gcc:<cxxflags>"-msse -msse2 -msse3 -mssse3"
|
||||
- <toolset>clang:<cxxflags>"-msse -msse2 -msse3 -mssse3"
|
||||
- <toolset>intel-linux:<cxxflags>"-xSSSE3"
|
||||
- <toolset>intel-darwin:<cxxflags>"-xSSSE3"
|
||||
+ <toolset>gcc:<cxxflags>
|
||||
+ <toolset>clang:<cxxflags>
|
||||
+ <toolset>intel-linux:<cxxflags>
|
||||
+ <toolset>intel-darwin:<cxxflags>
|
||||
<toolset>intel-win:<cxxflags>"/QxSSSE3"
|
||||
;
|
||||
|
||||
obj avx2 : avx2.cpp
|
||||
:
|
||||
- <toolset>gcc:<cxxflags>"-mavx -mavx2 -fabi-version=0"
|
||||
- <toolset>clang:<cxxflags>"-mavx -mavx2"
|
||||
- <toolset>intel-linux:<cxxflags>"-xCORE-AVX2 -fabi-version=0"
|
||||
- <toolset>intel-darwin:<cxxflags>"-xCORE-AVX2 -fabi-version=0"
|
||||
+ <toolset>gcc:<cxxflags>"-fabi-version=0"
|
||||
+ <toolset>clang:<cxxflags>
|
||||
+ <toolset>intel-linux:<cxxflags>"-fabi-version=0"
|
||||
+ <toolset>intel-darwin:<cxxflags>"-fabi-version=0"
|
||||
<toolset>intel-win:<cxxflags>"/arch:CORE-AVX2"
|
||||
<toolset>msvc:<cxxflags>"/arch:AVX"
|
||||
;
|
||||
diff --git a/libs/log/src/dump_avx2.cpp b/libs/log/src/dump_avx2.cpp
|
||||
index 4ab1250..610fc6d 100644
|
||||
--- a/libs/log/src/dump_avx2.cpp
|
||||
+++ b/libs/log/src/dump_avx2.cpp
|
||||
@@ -22,6 +22,10 @@
|
||||
#include <boost/cstdint.hpp>
|
||||
#include <boost/log/detail/header.hpp>
|
||||
|
||||
+#if !defined(__AVX2__)
|
||||
+#error "AVX2 Unsupported!"
|
||||
+#endif
|
||||
+
|
||||
#if defined(__x86_64) || defined(__x86_64__) || \
|
||||
defined(__amd64__) || defined(__amd64) || \
|
||||
defined(_M_X64)
|
||||
diff --git a/libs/log/src/dump_ssse3.cpp b/libs/log/src/dump_ssse3.cpp
|
||||
index 1325b49..60d4112 100644
|
||||
--- a/libs/log/src/dump_ssse3.cpp
|
||||
+++ b/libs/log/src/dump_ssse3.cpp
|
||||
@@ -22,6 +22,10 @@
|
||||
#include <boost/cstdint.hpp>
|
||||
#include <boost/log/detail/header.hpp>
|
||||
|
||||
+#if !defined(__SSSE3__)
|
||||
+#error "SSSE3 Unsupported!"
|
||||
+#endif
|
||||
+
|
||||
#if defined(__x86_64) || defined(__x86_64__) || \
|
||||
defined(__amd64__) || defined(__amd64) || \
|
||||
defined(_M_X64)
|
||||
--
|
||||
2.8.0
|
||||
@@ -4,7 +4,6 @@ require boost.inc
|
||||
SRC_URI += "file://arm-intrinsics.patch \
|
||||
file://boost-CVE-2012-2677.patch \
|
||||
file://boost-math-disable-pch-for-gcc.patch \
|
||||
file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \
|
||||
file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
|
||||
file://0001-dont-setup-compiler-flags-m32-m64.patch \
|
||||
file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \
|
||||
Reference in New Issue
Block a user