From patchwork Mon Dec 30 17:25:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 305816 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 578782C00BF for ; Tue, 31 Dec 2013 04:25:57 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 825F193FCC; Mon, 30 Dec 2013 17:25:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fKYj9NDGAwnq; Mon, 30 Dec 2013 17:25:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8665993DB6; Mon, 30 Dec 2013 17:25:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A0D981BF962 for ; Mon, 30 Dec 2013 17:25:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9B3508E84F for ; Mon, 30 Dec 2013 17:25:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RXf52+9paIrr for ; Mon, 30 Dec 2013 17:25:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from blu0-omc3-s1.blu0.hotmail.com (blu0-omc3-s1.blu0.hotmail.com [65.55.116.76]) by whitealder.osuosl.org (Postfix) with ESMTP id 7F6628E258 for ; Mon, 30 Dec 2013 17:25:52 +0000 (UTC) Received: from BLU0-SMTP239 ([65.55.116.74]) by blu0-omc3-s1.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 30 Dec 2013 09:25:51 -0800 X-TMN: [fNBzD254GaplZ34AC3Kp3RxWJkCktfiR] X-Originating-Email: [berndkuhls@hotmail.com] Message-ID: Received: from fli4l.lan.fli4l ([87.146.211.124]) by BLU0-SMTP239.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Mon, 30 Dec 2013 09:25:50 -0800 Received: from fli4lbuild.lan.fli4l ([192.168.1.50]:34808) by fli4l.lan.fli4l with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1Vxgb2-0001NL-Ml; Mon, 30 Dec 2013 18:25:47 +0100 From: Bernd Kuhls To: buildroot@busybox.net Date: Mon, 30 Dec 2013 18:25:28 +0100 X-Mailer: git-send-email 1.7.9.5 X-OriginalArrivalTime: 30 Dec 2013 17:25:50.0693 (UTC) FILETIME=[2F732150:01CF0584] MIME-Version: 1.0 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] boost: bump to version 1.55.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Bernd Kuhls --- ...ilation-of-Boost.Variants-move-assignment.patch | 50 -------------------- ...oost-0003-fix-64bit-build-with-recent-gcc.patch | 33 ------------- package/boost/boost.mk | 2 +- 3 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch delete mode 100644 package/boost/boost-0003-fix-64bit-build-with-recent-gcc.patch diff --git a/package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch b/package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch deleted file mode 100644 index 00dc7c6..0000000 --- a/package/boost/boost-0002-Fix-compilation-of-Boost.Variants-move-assignment.patch +++ /dev/null @@ -1,50 +0,0 @@ -Fix compilation of Boost.Variants move assignment for situations when one of the variant template classes has nothrow copy constructor and throwing move constructor (refs #8772) - -Fixes compilation error: - -.../output/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include/boost/variant/variant.hpp: In member function 'void boost::variant::move_assigner::internal_visit(RhsT&, int) [with RhsT = boost::shared_ptr, T0_ = boost::shared_ptr, T1 = boost::signals2::detail::foreign_void_shared_ptr, T2 = boost::detail::variant::void_, ..., T18 = boost::detail::variant::void_, T19 = boost::detail::variant::void_]': -... -.../output/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include/boost/variant/variant.hpp:2058:13: error: no matching function for call to 'boost::variant, boost::signals2::detail::foreign_void_shared_ptr>::move_assigner::assign_impl(boost::shared_ptr&, nothrow_copy, nothrow_move_constructor, boost::variant, boost::signals2::detail::foreign_void_shared_ptr>::has_fallback_type_)' - -Reported here: https://svn.boost.org/trac/boost/ticket/8772 - -Signed-off-by: Luca Ceresoli -Backported-from: https://svn.boost.org/trac/boost/changeset/85080 - ---- a/boost/variant/variant.hpp (revision 85079) -+++ b/boost/variant/variant.hpp (revision 85080) -@@ -1981,5 +1981,5 @@ - private: // helpers, for internal visitor interface (below) - -- template -+ template - void assign_impl( - RhsT& rhs_content ---- a/libs/variant/test/rvalue_test.cpp (revision 85079) -+++ b/libs/variant/test/rvalue_test.cpp (revision 85080) -@@ -197,4 +197,19 @@ - #endif - -+struct nothrow_copyable_throw_movable { -+ nothrow_copyable_throw_movable(){} -+ nothrow_copyable_throw_movable(const nothrow_copyable_throw_movable&) BOOST_NOEXCEPT {} -+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES -+ nothrow_copyable_throw_movable(nothrow_copyable_throw_movable&&) BOOST_NOEXCEPT_IF(false) {} -+#endif -+}; -+ -+// This test is created to cover the following situation: -+// https://svn.boost.org/trac/boost/ticket/8772 -+void run_tricky_compilation_test() -+{ -+ boost::variant v; -+ v = nothrow_copyable_throw_movable(); -+} - - int test_main(int , char* []) -@@ -204,4 +219,5 @@ - run_move_only(); - run_moves_are_noexcept(); -+ run_tricky_compilation_test(); - return 0; - } diff --git a/package/boost/boost-0003-fix-64bit-build-with-recent-gcc.patch b/package/boost/boost-0003-fix-64bit-build-with-recent-gcc.patch deleted file mode 100644 index 5fdfb01..0000000 --- a/package/boost/boost-0003-fix-64bit-build-with-recent-gcc.patch +++ /dev/null @@ -1,33 +0,0 @@ -Patch for recent versions of glibc which always assume int64_t support. - -Fixes compilation error with aarch64 target: - -./boost/atomic/atomic.hpp: At global scope: -./boost/atomic/atomic.hpp:202:16: error: 'uintptr_t' was not declared in this scope - typedef atomic atomic_uintptr_t; - ^ -./boost/atomic/atomic.hpp:202:25: error: template argument 1 is invalid - typedef atomic atomic_uintptr_t; - ^ -./boost/atomic/atomic.hpp:202:43: error: invalid type in declaration before ';' token - typedef atomic atomic_uintptr_t; - ^ - -Reported here: https://svn.boost.org/trac/boost/ticket/8973 -Fix reported here: https://svn.boost.org/trac/boost/ticket/8731 - -Signed-off-by: Luca Ceresoli -Backported-from: https://svn.boost.org/trac/boost/changeset/84950 - ---- a/boost/cstdint.hpp (revision 84805) -+++ b/boost/cstdint.hpp (revision 84950) -@@ -42,5 +42,8 @@ - // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990 - // --#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG)) -+#if defined(BOOST_HAS_STDINT_H) \ -+ && (!defined(__GLIBC__) \ -+ || defined(__GLIBC_HAVE_LONG_LONG) \ -+ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17))))) - - // The following #include is an implementation artifact; not part of interface. diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 799eb13..9ead1dd 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.54.0 +BOOST_VERSION = 1.55.0 BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION)) BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)