diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:45:20 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-10 01:15:05 +0300 |
commit | 82dbc15a05125a812c140a3c8cff81c366482229 (patch) | |
tree | 9c8f1ad262a2e281f20340cf8646aca6f8596044 /meta-openbmc-mods/meta-common/recipes-support | |
parent | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (diff) | |
download | openbmc-82dbc15a05125a812c140a3c8cff81c366482229.tar.xz |
Update to internal 0.26
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-support')
3 files changed, 113 insertions, 3 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-support/boost/boost/e8b0445e9837e232047173ddf6b4d541b1585915.patch b/meta-openbmc-mods/meta-common/recipes-support/boost/boost/e8b0445e9837e232047173ddf6b4d541b1585915.patch new file mode 100644 index 000000000..8bdacc5df --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-support/boost/boost/e8b0445e9837e232047173ddf6b4d541b1585915.patch @@ -0,0 +1,101 @@ +From 5308ba9daf66c50f950834c1469268f9d297f51a Mon Sep 17 00:00:00 2001 +From: Bruno Abinader <brunoabinader@gmail.com> +Date: Thu, 3 Sep 2020 12:04:08 +0300 +Subject: [PATCH 1/1] Enable ASIO builds without RTTI post 1.17.0 + +Signed-off-by: James Feist <james.feist@linux.intel.com> +--- + boost/asio/execution/any_executor.hpp | 23 +++++++++++++++++++++++ + boost/asio/io_context.hpp | 12 ++++++++++++ + 2 files changed, 35 insertions(+) + +diff --git a/boost/asio/execution/any_executor.hpp b/boost/asio/execution/any_executor.hpp +index 9c7018c88..c83f837a8 100644 +--- a/boost/asio/execution/any_executor.hpp ++++ b/boost/asio/execution/any_executor.hpp +@@ -620,7 +620,11 @@ public: + return static_cast<Executor*>(target_); + } + ++#if !defined(BOOST_ASIO_NO_TYPEID) + const std::type_info& target_type() const ++#else // !defined(BOOST_ASIO_NO_TYPEID) ++ const void* target_type() const ++#endif // !defined(BOOST_ASIO_NO_TYPEID) + { + return target_fns_->target_type(); + } +@@ -800,16 +804,27 @@ protected: + + struct target_fns + { ++#if !defined(BOOST_ASIO_NO_TYPEID) + const std::type_info& (*target_type)(); ++#else ++ const void* (*target_type)(); ++#endif + bool (*equal)(const any_executor_base&, const any_executor_base&); + void (*execute)(const any_executor_base&, BOOST_ASIO_MOVE_ARG(function)); + void (*blocking_execute)(const any_executor_base&, function_view); + }; + ++#if !defined(BOOST_ASIO_NO_TYPEID) + static const std::type_info& target_type_void() + { + return typeid(void); + } ++#else ++ static const void* target_type_void() ++ { ++ return 0; ++ } ++#endif // !defined(BOOST_ASIO_NO_TYPEID) + + static bool equal_void(const any_executor_base&, const any_executor_base&) + { +@@ -845,11 +860,19 @@ protected: + return &fns; + } + ++#if !defined(BOOST_ASIO_NO_TYPEID) + template <typename Ex> + static const std::type_info& target_type_ex() + { + return typeid(Ex); + } ++#else // !defined(BOOST_ASIO_NO_TYPEID) ++ template <typename Ex> ++ static const void* target_type_ex() ++ { ++ return 0; ++ } ++#endif // !defined(BOOST_ASIO_NO_TYPEID) + + template <typename Ex> + static bool equal_ex(const any_executor_base& ex1, +diff --git a/boost/asio/io_context.hpp b/boost/asio/io_context.hpp +index 6a64ef514..b5672b3d2 100644 +--- a/boost/asio/io_context.hpp ++++ b/boost/asio/io_context.hpp +@@ -714,6 +714,18 @@ public: + basic_executor_type&& other) BOOST_ASIO_NOEXCEPT; + #endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION) + ++#if !defined(BOOST_ASIO_NO_TYPEID) ++ static const std::type_info& type_id() ++ { ++ return typeid(basic_executor_type); ++#else // !defined(BOOST_ASIO_NO_TYPEID) ++ static const void* type_id() ++ { ++ static int unique_id; ++ return &unique_id; ++#endif // !defined(BOOST_ASIO_NO_TYPEID) ++ } ++ + /// Obtain an executor with the @c blocking.possibly property. + /** + * Do not call this function directly. It is intended for use with the +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-support/boost/boost_%.bbappend b/meta-openbmc-mods/meta-common/recipes-support/boost/boost_%.bbappend new file mode 100644 index 000000000..d5b102d0e --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-support/boost/boost_%.bbappend @@ -0,0 +1,9 @@ +FILES_${PN} += "/usr/lib/libboost_chrono.so* \ + /usr/lib/libboost_thread.so*" + +#todo this is against standard but iostreams used in mtd-util +BOOST_LIBS_intel += "iostreams" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +# this patch is for issue https://github.com/chriskohlhoff/asio/issues/533 +SRC_URI += "file://e8b0445e9837e232047173ddf6b4d541b1585915.patch" diff --git a/meta-openbmc-mods/meta-common/recipes-support/gnutls/gnutls_%.bbappend b/meta-openbmc-mods/meta-common/recipes-support/gnutls/gnutls_%.bbappend index ed9dd31e8..4377bf0e3 100644 --- a/meta-openbmc-mods/meta-common/recipes-support/gnutls/gnutls_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-support/gnutls/gnutls_%.bbappend @@ -1,12 +1,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PV = "3.6.14" +PV = "3.6.15" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ " -SRC_URI[md5sum] = "bf70632d420e421baff482247f01dbfe" +SRC_URI[md5sum] = "e80e0d20a8bb337a15fa63caa7f67006" #SRC_URI[sha256sum] = "3847a3354dd908c5e603f490865ae10577d7ee3b5edf35e82d1ed8cfa1cf0191" -SRC_URI[sha256sum] = "5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63" +SRC_URI[sha256sum] = "0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558" |