Accepting request 970258 from devel:libraries:c_c++
- update to 1.79.0: * no new libraries * for details on all changes see, https://www.boost.org/users/history/version_1_79_0.html - add 0001-json-array-erase-relocate.patch - drop 0001-b2-fix-install.patch (obsolete) OBS-URL: https://build.opensuse.org/request/show/970258 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=155
This commit is contained in:
commit
0bfa64a252
@ -1,80 +0,0 @@
|
||||
https://github.com/bfgroup/b2/pull/113
|
||||
|
||||
From 62e7321669f66a90e2a90c8f31af34f59ebc5d7a Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Arkhipov <grisumbras@gmail.com>
|
||||
Date: Thu, 9 Dec 2021 08:11:57 +0300
|
||||
Subject: [PATCH] Don't skip install targets if there's <build>no in ureqs
|
||||
|
||||
---
|
||||
src/tools/stage.jam | 4 ++++
|
||||
test/install_build_no.py | 26 ++++++++++++++++++++++++++
|
||||
test/test_all.py | 1 +
|
||||
3 files changed, 31 insertions(+)
|
||||
create mode 100755 test/install_build_no.py
|
||||
|
||||
Index: boost_1_78_0/tools/build/src/tools/stage.jam
|
||||
===================================================================
|
||||
--- boost_1_78_0.orig/tools/build/src/tools/stage.jam 2021-12-09 16:30:45.956457531 +0300
|
||||
+++ boost_1_78_0/tools/build/src/tools/stage.jam 2021-12-09 16:30:45.952457519 +0300
|
||||
@@ -476,10 +476,14 @@ class install-target-class : basic-targe
|
||||
}
|
||||
DELETE_MODULE $(result) ;
|
||||
return [ sequence.unique $(result2) ] ;
|
||||
}
|
||||
|
||||
+ rule skip-from-usage-requirements ( )
|
||||
+ {
|
||||
+ }
|
||||
+
|
||||
# Returns true iff 'type' is subtype of some element of 'types-to-include'.
|
||||
#
|
||||
local rule include-type ( type : types-to-include * )
|
||||
{
|
||||
local found ;
|
||||
Index: boost_1_78_0/tools/build/test/install_build_no.py
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ boost_1_78_0/tools/build/test/install_build_no.py 2021-12-09 16:30:45.953457522 +0300
|
||||
@@ -0,0 +1,26 @@
|
||||
+#!/usr/bin/python
|
||||
+
|
||||
+# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com)
|
||||
+# Distributed under the Boost Software License, Version 1.0.
|
||||
+# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt)
|
||||
+
|
||||
+# Check that <build>no in usage-requirements of dependencies does not affect
|
||||
+# install rule, i.e. a skipped installed target does not affect insallation of
|
||||
+# other targets.
|
||||
+
|
||||
+import BoostBuild
|
||||
+
|
||||
+t = BoostBuild.Tester()
|
||||
+
|
||||
+t.write("a.cpp", "int main() {}\n")
|
||||
+
|
||||
+t.write("jamroot.jam", """
|
||||
+make x : : maker : <build>no ;
|
||||
+exe a : a.cpp ;
|
||||
+install install : x a ;
|
||||
+""")
|
||||
+
|
||||
+t.run_build_system()
|
||||
+t.expect_addition("install/a.exe")
|
||||
+
|
||||
+t.cleanup()
|
||||
Index: boost_1_78_0/tools/build/test/test_all.py
|
||||
===================================================================
|
||||
--- boost_1_78_0.orig/tools/build/test/test_all.py 2021-12-09 16:30:45.956457531 +0300
|
||||
+++ boost_1_78_0/tools/build/test/test_all.py 2021-12-09 16:30:45.953457522 +0300
|
||||
@@ -248,10 +248,11 @@ tests = ["abs_workdir",
|
||||
"implicit_dependency",
|
||||
"indirect_conditional",
|
||||
"inherit_toolset",
|
||||
"inherited_dependency",
|
||||
"inline",
|
||||
+ "install_build_no",
|
||||
"libjpeg",
|
||||
"liblzma",
|
||||
"libpng",
|
||||
"libtiff",
|
||||
"libzstd",
|
49
0001-json-array-erase-relocate.patch
Normal file
49
0001-json-array-erase-relocate.patch
Normal file
@ -0,0 +1,49 @@
|
||||
diff -ur boost_1_79_0/boost/json/impl/array.ipp boost_1_79_0/boost/json/impl/array.ipp
|
||||
--- boost_1_79_0/boost/json/impl/array.ipp 2022-04-06 17:02:43.000000000 -0400
|
||||
+++ boost_1_79_0/boost/json/impl/array.ipp 2022-04-13 20:55:20.464359478 -0400
|
||||
@@ -491,8 +491,11 @@
|
||||
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;
|
||||
}
|
||||
|
||||
diff -ur boost_1_79_0/libs/json/test/array.cpp boost_1_79_0/libs/json/test/array.cpp
|
||||
--- boost_1_79_0/libs/json/test/array.cpp 2022-04-06 17:02:43.000000000 -0400
|
||||
+++ boost_1_79_0/libs/json/test/array.cpp 2022-04-13 20:53:32.671782680 -0400
|
||||
@@ -1270,6 +1270,21 @@
|
||||
}
|
||||
|
||||
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 @@
|
||||
testExceptions();
|
||||
testEquality();
|
||||
testHash();
|
||||
+ testIssue692();
|
||||
}
|
||||
};
|
||||
|
@ -1,26 +1,26 @@
|
||||
libboost_atomic1_78_0
|
||||
libboost_container1_78_0
|
||||
libboost_context1_78_0
|
||||
libboost_coroutine1_78_0
|
||||
libboost_date_time1_78_0
|
||||
libboost_fiber1_78_0
|
||||
libboost_filesystem1_78_0
|
||||
libboost_graph1_78_0
|
||||
libboost_graph_parallel1_78_0
|
||||
libboost_iostreams1_78_0
|
||||
libboost_locale1_78_0
|
||||
libboost_math1_78_0
|
||||
libboost_mpi1_78_0
|
||||
libboost_nowide1_78_0
|
||||
libboost_test1_78_0
|
||||
libboost_program_options1_78_0
|
||||
libboost_python-py3-1_78_0
|
||||
libboost_random1_78_0
|
||||
libboost_serialization1_78_0
|
||||
libboost_stacktrace1_78_0
|
||||
libboost_system1_78_0
|
||||
libboost_thread1_78_0
|
||||
libboost_type_erasure1_78_0
|
||||
libboost_wave1_78_0
|
||||
libboost_regex1_78_0
|
||||
libboost_json1_78_0
|
||||
libboost_atomic1_79_0
|
||||
libboost_container1_79_0
|
||||
libboost_context1_79_0
|
||||
libboost_coroutine1_79_0
|
||||
libboost_date_time1_79_0
|
||||
libboost_fiber1_79_0
|
||||
libboost_filesystem1_79_0
|
||||
libboost_graph1_79_0
|
||||
libboost_graph_parallel1_79_0
|
||||
libboost_iostreams1_79_0
|
||||
libboost_locale1_79_0
|
||||
libboost_math1_79_0
|
||||
libboost_mpi1_79_0
|
||||
libboost_nowide1_79_0
|
||||
libboost_test1_79_0
|
||||
libboost_program_options1_79_0
|
||||
libboost_python-py3-1_79_0
|
||||
libboost_random1_79_0
|
||||
libboost_serialization1_79_0
|
||||
libboost_stacktrace1_79_0
|
||||
libboost_system1_79_0
|
||||
libboost_thread1_79_0
|
||||
libboost_type_erasure1_79_0
|
||||
libboost_wave1_79_0
|
||||
libboost_regex1_79_0
|
||||
libboost_json1_79_0
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 15 00:23:22 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 1.79.0:
|
||||
* no new libraries
|
||||
* for details on all changes see,
|
||||
https://www.boost.org/users/history/version_1_79_0.html
|
||||
- add 0001-json-array-erase-relocate.patch
|
||||
- drop 0001-b2-fix-install.patch (obsolete)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 11 15:11:05 CET 2022 - aschnell@suse.com
|
||||
|
||||
|
13
boost.spec
13
boost.spec
@ -19,9 +19,9 @@
|
||||
#
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
|
||||
%define ver 1.78.0
|
||||
%define _ver 1_78_0
|
||||
%define package_version 1_78_0
|
||||
%define ver 1.79.0
|
||||
%define _ver 1_79_0
|
||||
%define package_version 1_79_0
|
||||
%define file_version %_ver
|
||||
%define lib_appendix %_ver
|
||||
%define docs_version 1.56.0
|
||||
@ -235,10 +235,9 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
|
||||
%endif
|
||||
|
||||
Name: %{base_name}
|
||||
Version: 1.78.0
|
||||
Version: 1.79.0
|
||||
Release: 0
|
||||
%define library_version 1_78_0
|
||||
|
||||
%define library_version 1_79_0
|
||||
Summary: Boost C++ Libraries
|
||||
License: BSL-1.0
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -266,7 +265,7 @@ Patch18: dynamic_linking.patch
|
||||
Patch20: python_library_name.patch
|
||||
Patch21: boost-remove-cmakedir.patch
|
||||
Patch22: boost-process.patch
|
||||
Patch23: 0001-b2-fix-install.patch
|
||||
Patch23: https://www.boost.org/patches/1_79_0/0001-json-array-erase-relocate.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gmp-devel
|
||||
BuildRequires: libbz2-devel
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc
|
||||
size 110675550
|
3
boost_1_79_0.tar.bz2
Normal file
3
boost_1_79_0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
|
||||
size 113456811
|
Loading…
Reference in New Issue
Block a user