Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boost: Bump to version 1.79.0 #419

Merged
merged 6 commits into from
Apr 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions libs/boost/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=boost
PKG_VERSION:=1.76.0
PKG_SOURCE_VERSION:=1_76_0
PKG_VERSION:=1.79.0
PKG_SOURCE_VERSION:=1_79_0
PKG_RELEASE:=$(AUTORELEASE)

PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERSION) https://dl.bintray.com/boostorg/release/$(PKG_VERSION)/source/
PKG_HASH:=f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41
PKG_HASH:=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39

PKG_MAINTAINER:=Carlos M. Ferreira <carlosmf.pt@gmail.com>
PKG_LICENSE:=BSL-1.0
Expand All @@ -42,7 +42,7 @@ define Package/boost/Default
endef

define Package/boost/description
This package provides the Boost v1.76.0 libraries.
This package provides the Boost v1.79.0 libraries.
Boost is a set of free, peer-reviewed, portable C++ source libraries.

This package provides the following run-time libraries:
Expand Down Expand Up @@ -77,7 +77,7 @@ This package provides the following run-time libraries:
- wave

There are many more header-only libraries supported by Boost.
See more at http://www.boost.org/doc/libs/1_76_0/
See more at http://www.boost.org/doc/libs/1_78_0/
endef

PKG_BUILD_DEPENDS:=boost/host
Expand Down Expand Up @@ -342,7 +342,7 @@ $(eval $(call DefineBoostLibrary,coroutine,system chrono context thread,,!boost-
$(eval $(call DefineBoostLibrary,date_time))
#$(eval $(call DefineBoostLibrary,exception,,))
$(eval $(call DefineBoostLibrary,fiber,coroutine filesystem,,!boost-fiber-exclude))
$(eval $(call DefineBoostLibrary,filesystem,system))
$(eval $(call DefineBoostLibrary,filesystem,system atomic))
$(eval $(call DefineBoostLibrary,graph,regex))
$(eval $(call DefineBoostLibrary,iostreams,,,,zlib liblzma libbz2 libzstd))
$(eval $(call DefineBoostLibrary,json,container))
Expand Down
11 changes: 0 additions & 11 deletions libs/boost/patches/010-mips64-fiber.patch

This file was deleted.

29 changes: 0 additions & 29 deletions libs/boost/patches/020-regex.patch

This file was deleted.

47 changes: 47 additions & 0 deletions libs/boost/patches/910-json-array-erase-relocate.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
--- a/boost/json/impl/array.ipp
+++ b/boost/json/impl/array.ipp
@@ -491,8 +491,11 @@ erase(
auto const p = &(*t_)[0] +
(pos - &(*t_)[0]);
destroy(p, p + 1);
- relocate(p, p + 1, 1);
--t_->size;
+ if(t_->size > 0)
+ relocate(p, p + 1,
+ t_->size - (p -
+ &(*t_)[0]));
return p;
}

--- a/libs/json/test/array.cpp
+++ b/libs/json/test/array.cpp
@@ -1270,6 +1270,21 @@ public:
}

void
+ testIssue692()
+ {
+ array a;
+ object obj;
+ obj["test1"] = "hello";
+ a.push_back(obj);
+ a.push_back(obj);
+ a.push_back(obj);
+ a.push_back(obj);
+ a.push_back(obj);
+ while(a.size())
+ a.erase(a.begin());
+ }
+
+ void
run()
{
testDestroy();
@@ -1283,6 +1298,7 @@ public:
testExceptions();
testEquality();
testHash();
+ testIssue692();
}
};