Openembedded Core Discussions
 help / color / mirror / Atom feed
From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 08/22] boost: update 1.74.0 -> 1.75.0
Date: Mon, 28 Dec 2020 21:04:22 +0100	[thread overview]
Message-ID: <20201228200436.78130-8-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20201228200436.78130-1-alex.kanavin@gmail.com>

Remove 0001-Apply-boost-1.62.0-no-forced-flags.patch.patch:
upstream has refactored the code, purpose of the patch is unclear.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../{boost-1.74.0.inc => boost-1.75.0.inc}    |   2 +-
 ...y-boost-1.62.0-no-forced-flags.patch.patch | 100 ------------------
 .../{boost_1.74.0.bb => boost_1.75.0.bb}      |   1 -
 3 files changed, 1 insertion(+), 102 deletions(-)
 rename meta/recipes-support/boost/{boost-1.74.0.inc => boost-1.75.0.inc} (90%)
 delete mode 100644 meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch
 rename meta/recipes-support/boost/{boost_1.74.0.bb => boost_1.75.0.bb} (85%)

diff --git a/meta/recipes-support/boost/boost-1.74.0.inc b/meta/recipes-support/boost/boost-1.75.0.inc
similarity index 90%
rename from meta/recipes-support/boost/boost-1.74.0.inc
rename to meta/recipes-support/boost/boost-1.75.0.inc
index b47fdaf099..e5a8488c58 100644
--- a/meta/recipes-support/boost/boost-1.74.0.inc
+++ b/meta/recipes-support/boost/boost-1.75.0.inc
@@ -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/"
diff --git a/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch b/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch
deleted file mode 100644
index 169906344f..0000000000
--- a/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch
+++ /dev/null
@@ -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
diff --git a/meta/recipes-support/boost/boost_1.74.0.bb b/meta/recipes-support/boost/boost_1.75.0.bb
similarity index 85%
rename from meta/recipes-support/boost/boost_1.74.0.bb
rename to meta/recipes-support/boost/boost_1.75.0.bb
index b01b390a59..33137e236d 100644
--- a/meta/recipes-support/boost/boost_1.74.0.bb
+++ b/meta/recipes-support/boost/boost_1.75.0.bb
@@ -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 \
-- 
2.29.2


  parent reply	other threads:[~2020-12-28 20:04 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-28 20:04 [PATCH 01/22] devtool: gitsm:// should be handled same as git:// in upgrades Alexander Kanavin
2020-12-28 20:04 ` [PATCH 02/22] ovmf: upgrade 202008 -> 202011 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 03/22] libksba: update 1.4.0 -> 1.5.0 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 04/22] libjitterentropy: update 2.2.0 -> 3.0.0 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 05/22] icu: update 68.1 -> 68.2 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 06/22] gnutls: update 3.6.15 -> 3.7.0 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 07/22] gnupg: update 2.2.23 -> 2.2.26 Alexander Kanavin
2020-12-28 20:04 ` Alexander Kanavin [this message]
2020-12-28 20:04 ` [PATCH 09/22] kexec-tools: update 2.0.20 -> 2.0.21 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 10/22] vulkan-samples: update to latest revision Alexander Kanavin
2020-12-28 20:04 ` [PATCH 11/22] libpam: update 1.3.1 -> 1.5.1 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 12/22] autotools.bbclass: make it possible to inhibit m4 deletion Alexander Kanavin
2020-12-28 20:04 ` [PATCH 13/22] bash: update 5.0 -> 5.1 Alexander Kanavin
2021-01-07 17:57   ` [OE-core] " Richard Purdie
2021-01-07 18:43     ` Joshua Watt
2021-01-07 19:07       ` Otavio Salvador
2021-01-07 19:10         ` Alexander Kanavin
2021-01-07 21:55       ` Richard Purdie
2020-12-28 20:04 ` [PATCH 14/22] strace: update 5.9 -> 5.10 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 15/22] python3-pytest: update 6.1.2 -> 6.2.1 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 16/22] mtools: update 4.0.25 -> 4.0.26 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 17/22] gnu-config: update to latest revision Alexander Kanavin
2020-12-28 20:04 ` [PATCH 18/22] cmake: update 3.18.4 -> 3.19.2 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 19/22] ccache: upgrade 3.7.11 -> 4.1 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 20/22] ccache.bbclass: use ccache from host distribution Alexander Kanavin
2020-12-28 20:04 ` [PATCH 21/22] runtime_test.py: correct output check for bash 5.1 Alexander Kanavin
2020-12-28 20:04 ` [PATCH 22/22] gawk: add missing ptest dependency Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201228200436.78130-8-alex.kanavin@gmail.com \
    --to=alex.kanavin@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox