- update to 1.80.0:
* no new libraries * for details on all the long list of changes, see https://www.boost.org/users/history/version_1_80_0.html - drop 0001-json-array-erase-relocate.patch boost-mp-locale-fix.patch: upstream OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=303
This commit is contained in:
parent
956ce2a015
commit
1abb2a6951
@ -1,49 +0,0 @@
|
||||
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_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
|
||||
libboost_atomic1_80_0
|
||||
libboost_container1_80_0
|
||||
libboost_context1_80_0
|
||||
libboost_coroutine1_80_0
|
||||
libboost_date_time1_80_0
|
||||
libboost_fiber1_80_0
|
||||
libboost_filesystem1_80_0
|
||||
libboost_graph1_80_0
|
||||
libboost_graph_parallel1_80_0
|
||||
libboost_iostreams1_80_0
|
||||
libboost_locale1_80_0
|
||||
libboost_math1_80_0
|
||||
libboost_mpi1_80_0
|
||||
libboost_nowide1_80_0
|
||||
libboost_test1_80_0
|
||||
libboost_program_options1_80_0
|
||||
libboost_python-py3-1_80_0
|
||||
libboost_random1_80_0
|
||||
libboost_serialization1_80_0
|
||||
libboost_stacktrace1_80_0
|
||||
libboost_system1_80_0
|
||||
libboost_thread1_80_0
|
||||
libboost_type_erasure1_80_0
|
||||
libboost_wave1_80_0
|
||||
libboost_regex1_80_0
|
||||
libboost_json1_80_0
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: boost_1_74_0/tools/build/src/tools/python.jam
|
||||
Index: boost_1_80_0/tools/build/src/tools/python.jam
|
||||
===================================================================
|
||||
--- boost_1_74_0.orig/tools/build/src/tools/python.jam
|
||||
+++ boost_1_74_0/tools/build/src/tools/python.jam
|
||||
--- boost_1_80_0.orig/tools/build/src/tools/python.jam
|
||||
+++ boost_1_80_0/tools/build/src/tools/python.jam
|
||||
@@ -102,7 +102,7 @@ py3-version = ;
|
||||
# using python : 2.3 : /usr/local/bin/python ;
|
||||
#
|
||||
@ -29,7 +29,7 @@ Index: boost_1_74_0/tools/build/src/tools/python.jam
|
||||
{
|
||||
exec-prefix ?= $(prefix) ;
|
||||
|
||||
@@ -671,7 +671,7 @@ rule version-suffix ( version )
|
||||
@@ -677,7 +677,7 @@ rule version-suffix ( version )
|
||||
|
||||
# Declare a target to represent Python's library.
|
||||
#
|
||||
@ -38,7 +38,7 @@ Index: boost_1_74_0/tools/build/src/tools/python.jam
|
||||
{
|
||||
# Compute the representation of Python version in the name of Python's
|
||||
# library file.
|
||||
@@ -695,13 +695,13 @@ local rule declare-libpython-target ( ve
|
||||
@@ -701,13 +701,13 @@ local rule declare-libpython-target ( ve
|
||||
}
|
||||
|
||||
# Declare it.
|
||||
@ -54,7 +54,7 @@ Index: boost_1_74_0/tools/build/src/tools/python.jam
|
||||
{
|
||||
local prefix ;
|
||||
local exec-prefix ;
|
||||
@@ -717,6 +717,7 @@ local rule configure ( version ? : cmd-o
|
||||
@@ -723,6 +723,7 @@ local rule configure ( version ? : cmd-o
|
||||
extension-suffix ?= _d ;
|
||||
}
|
||||
extension-suffix ?= "" ;
|
||||
@ -62,7 +62,7 @@ Index: boost_1_74_0/tools/build/src/tools/python.jam
|
||||
|
||||
local cmds-to-try ;
|
||||
|
||||
@@ -792,7 +793,7 @@ local rule configure ( version ? : cmd-o
|
||||
@@ -798,7 +799,7 @@ local rule configure ( version ? : cmd-o
|
||||
exec-prefix = $(sys.exec_prefix) ;
|
||||
|
||||
compute-default-paths $(target-os) : $(sys.version) :
|
||||
@ -71,7 +71,7 @@ Index: boost_1_74_0/tools/build/src/tools/python.jam
|
||||
|
||||
version = $(sys.version) ;
|
||||
interpreter-cmd ?= $(cmd) ;
|
||||
@@ -973,7 +974,7 @@ local rule configure ( version ? : cmd-o
|
||||
@@ -979,7 +980,7 @@ local rule configure ( version ? : cmd-o
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: boost_1_74_0/tools/build/src/tools/gcc.jam
|
||||
Index: boost_1_80_0/tools/build/src/tools/gcc.jam
|
||||
===================================================================
|
||||
--- boost_1_74_0.orig/tools/build/src/tools/gcc.jam
|
||||
+++ boost_1_74_0/tools/build/src/tools/gcc.jam
|
||||
@@ -442,7 +442,6 @@ local rule compile-link-flags ( * )
|
||||
--- boost_1_80_0.orig/tools/build/src/tools/gcc.jam
|
||||
+++ boost_1_80_0/tools/build/src/tools/gcc.jam
|
||||
@@ -371,7 +371,6 @@ local rule compile-link-flags ( * )
|
||||
local generic-os = [ set.difference $(all-os) : aix hpux ] ;
|
||||
local arch = power sparc x86 ;
|
||||
compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>32 : -m32 ;
|
||||
|
@ -1,108 +0,0 @@
|
||||
From b30cfbb5dd7bf0a03730a5e25d35b4fd61add6e7 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Borland <matt@mattborland.com>
|
||||
Date: Sat, 28 May 2022 08:53:35 -0700
|
||||
Subject: [PATCH] Fix for issue #464
|
||||
|
||||
---
|
||||
.../boost/multiprecision/cpp_dec_float.hpp | 22 +++++++++++--
|
||||
test/Jamfile.v2 | 1 +
|
||||
test/git_issue_464.cpp | 31 +++++++++++++++++++
|
||||
3 files changed, 52 insertions(+), 2 deletions(-)
|
||||
create mode 100644 test/git_issue_464.cpp
|
||||
|
||||
diff --git a/include/boost/multiprecision/cpp_dec_float.hpp b/include/boost/multiprecision/cpp_dec_float.hpp
|
||||
index bed38d5cf..074073827 100644
|
||||
--- a/boost/multiprecision/cpp_dec_float.hpp
|
||||
+++ b/boost/multiprecision/cpp_dec_float.hpp
|
||||
@@ -26,6 +26,8 @@
|
||||
#include <string>
|
||||
#include <limits>
|
||||
#include <stdexcept>
|
||||
+#include <sstream>
|
||||
+#include <locale>
|
||||
#include <boost/multiprecision/detail/standalone_config.hpp>
|
||||
#include <boost/multiprecision/number.hpp>
|
||||
#include <boost/multiprecision/detail/fpclassify.hpp>
|
||||
@@ -1603,7 +1605,15 @@ double cpp_dec_float<Digits10, ExponentType, Allocator>::extract_double() const
|
||||
: -std::numeric_limits<double>::infinity());
|
||||
}
|
||||
|
||||
- return std::strtod(str(std::numeric_limits<double>::digits10 + (2 + 1), std::ios_base::scientific).c_str(), nullptr);
|
||||
+ std::stringstream ss;
|
||||
+ ss.imbue(std::locale::classic());
|
||||
+
|
||||
+ ss << str(std::numeric_limits<double>::digits10 + (2 + 1), std::ios_base::scientific);
|
||||
+
|
||||
+ double d;
|
||||
+ ss >> d;
|
||||
+
|
||||
+ return d;
|
||||
}
|
||||
|
||||
template <unsigned Digits10, class ExponentType, class Allocator>
|
||||
@@ -1642,7 +1652,15 @@ long double cpp_dec_float<Digits10, ExponentType, Allocator>::extract_long_doubl
|
||||
: -std::numeric_limits<long double>::infinity());
|
||||
}
|
||||
|
||||
- return std::strtold(str(std::numeric_limits<long double>::digits10 + (2 + 1), std::ios_base::scientific).c_str(), nullptr);
|
||||
+ std::stringstream ss;
|
||||
+ ss.imbue(std::locale::classic());
|
||||
+
|
||||
+ ss << str(std::numeric_limits<long double>::digits10 + (2 + 1), std::ios_base::scientific);
|
||||
+
|
||||
+ long double ld;
|
||||
+ ss >> ld;
|
||||
+
|
||||
+ return ld;
|
||||
}
|
||||
|
||||
template <unsigned Digits10, class ExponentType, class Allocator>
|
||||
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
|
||||
index 4ad012273..f5d88edf2 100644
|
||||
--- a/libs/multiprecision/test/Jamfile.v2
|
||||
+++ b/libs/multiprecision/test/Jamfile.v2
|
||||
@@ -1176,6 +1176,7 @@ test-suite misc :
|
||||
[ run git_issue_426.cpp : : : [ check-target-builds ../config//has_mpfr : <source>gmp <source>mpfr <define>TEST_MPFR ] [ check-target-builds ../config//has_float128 : <source>quadmath <define>TEST_FLOAT128 ] ]
|
||||
[ run git_issue_277.cpp ]
|
||||
[ run git_issue_313.cpp ]
|
||||
+ [ run git_issue_464.cpp ]
|
||||
[ compile git_issue_98.cpp :
|
||||
[ check-target-builds ../config//has_float128 : <define>TEST_FLOAT128 <source>quadmath : ]
|
||||
[ check-target-builds ../config//has_gmp : <define>TEST_GMP <source>gmp : ]
|
||||
diff --git a/test/git_issue_464.cpp b/test/git_issue_464.cpp
|
||||
new file mode 100644
|
||||
index 000000000..dc9d0054a
|
||||
--- /dev/null
|
||||
+++ b/libs/multiprecision/test/git_issue_464.cpp
|
||||
@@ -0,0 +1,31 @@
|
||||
+///////////////////////////////////////////////////////////////////////////////
|
||||
+// Copyright 2022 Matt Borland. Distributed under the Boost
|
||||
+// Software License, Version 1.0. (See accompanying file
|
||||
+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
+//
|
||||
+// See: https://github.com/boostorg/multiprecision/issues/464
|
||||
+
|
||||
+#include <boost/multiprecision/cpp_dec_float.hpp>
|
||||
+#include <locale>
|
||||
+#include "test.hpp"
|
||||
+
|
||||
+template <typename T>
|
||||
+void test()
|
||||
+{
|
||||
+ auto a = boost::multiprecision::cpp_dec_float_50 {12345};
|
||||
+
|
||||
+ auto d1 = a.convert_to<T>();
|
||||
+
|
||||
+ std::locale::global(std::locale("de_DE"));
|
||||
+ auto d2 = a.convert_to<T>();
|
||||
+
|
||||
+ BOOST_CHECK_EQUAL(d1, d2);
|
||||
+}
|
||||
+
|
||||
+int main(void)
|
||||
+{
|
||||
+ test<double>();
|
||||
+ test<long double>();
|
||||
+
|
||||
+ return boost::report_errors();
|
||||
+}
|
@ -75,7 +75,7 @@ Index: libs/python/src/object/class.cpp
|
||||
===================================================================
|
||||
--- libs/python/src/object/class.cpp.orig
|
||||
+++ libs/python/src/object/class.cpp
|
||||
@@ -616,9 +616,11 @@ namespace objects
|
||||
@@ -612,9 +612,11 @@ namespace objects
|
||||
void class_base::add_property(
|
||||
char const* name, object const& fget, char const* docstr)
|
||||
{
|
||||
@ -88,7 +88,7 @@ Index: libs/python/src/object/class.cpp
|
||||
|
||||
this->setattr(name, property);
|
||||
}
|
||||
@@ -626,9 +628,11 @@ namespace objects
|
||||
@@ -622,9 +624,11 @@ namespace objects
|
||||
void class_base::add_property(
|
||||
char const* name, object const& fget, object const& fset, char const* docstr)
|
||||
{
|
||||
|
@ -4,8 +4,8 @@ Check that request size doesn't overflow.
|
||||
|
||||
Index: boost/pool/pool.hpp
|
||||
===================================================================
|
||||
--- boost/pool/pool.hpp.orig 2007-11-25 19:07:19.000000000 +0100
|
||||
+++ boost/pool/pool.hpp 2012-06-22 13:03:49.422438613 +0200
|
||||
--- boost/pool/pool.hpp.orig
|
||||
+++ boost/pool/pool.hpp
|
||||
@@ -10,6 +10,8 @@
|
||||
#define BOOST_POOL_HPP
|
||||
|
||||
@ -15,9 +15,9 @@ Index: boost/pool/pool.hpp
|
||||
|
||||
// std::less, std::less_equal, std::greater
|
||||
#include <functional>
|
||||
@@ -793,6 +793,9 @@ void * pool<UserAllocator>::ordered_mall
|
||||
//! \returns Address of chunk n if allocated ok.
|
||||
//! \returns 0 if not enough memory for n chunks.
|
||||
@@ -806,6 +808,9 @@ void * pool<UserAllocator>::ordered_mall
|
||||
if (n > max_chunks())
|
||||
return 0;
|
||||
|
||||
+ if (requested_size && (n > (std::numeric_limits<size_type>::max)() / requested_size))
|
||||
+ return 0;
|
||||
@ -25,7 +25,7 @@ Index: boost/pool/pool.hpp
|
||||
const size_type partition_size = alloc_size();
|
||||
const size_type total_req_size = n * requested_size;
|
||||
const size_type num_chunks = total_req_size / partition_size +
|
||||
@@ -975,6 +979,8 @@
|
||||
@@ -988,6 +993,8 @@ public:
|
||||
{
|
||||
if(max_alloc_size && (n > max_alloc_size))
|
||||
return 0;
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: boost_1_74_0/tools/boost_install/boost-install.jam
|
||||
Index: boost_1_80_0/tools/boost_install/boost-install.jam
|
||||
===================================================================
|
||||
--- boost_1_74_0.orig/tools/boost_install/boost-install.jam
|
||||
+++ boost_1_74_0/tools/boost_install/boost-install.jam
|
||||
@@ -652,25 +652,6 @@ rule generate-cmake-config- ( target : s
|
||||
--- boost_1_80_0.orig/tools/boost_install/boost-install.jam
|
||||
+++ boost_1_80_0/tools/boost_install/boost-install.jam
|
||||
@@ -753,25 +753,6 @@ rule generate-cmake-config- ( target : s
|
||||
"get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
|
||||
: true ;
|
||||
|
||||
|
@ -2,16 +2,20 @@ Index: tools/build/src/tools/gcc.jam
|
||||
===================================================================
|
||||
--- tools/build/src/tools/gcc.jam.orig
|
||||
+++ tools/build/src/tools/gcc.jam
|
||||
@@ -704,15 +704,15 @@ actions compile.c.pch
|
||||
@@ -623,17 +623,17 @@ actions compile.c.pch
|
||||
###
|
||||
|
||||
# Declare flags and action for compilation.
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>minimal : -O1 ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>debug : -Og ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>speed : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>space : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>minimal : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>debug : ;
|
||||
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ;
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 17 21:05:02 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 1.80.0:
|
||||
* no new libraries
|
||||
* for details on all the long list of changes, see
|
||||
https://www.boost.org/users/history/version_1_80_0.html
|
||||
- drop 0001-json-array-erase-relocate.patch
|
||||
boost-mp-locale-fix.patch: upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 29 12:51:47 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
|
14
boost.spec
14
boost.spec
@ -19,9 +19,9 @@
|
||||
#
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
|
||||
%define ver 1.79.0
|
||||
%define _ver 1_79_0
|
||||
%define package_version 1_79_0
|
||||
%define ver 1.80.0
|
||||
%define _ver 1_80_0
|
||||
%define package_version 1_80_0
|
||||
%define file_version %_ver
|
||||
%define lib_appendix %_ver
|
||||
%define docs_version 1.56.0
|
||||
@ -235,9 +235,9 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
|
||||
%endif
|
||||
|
||||
Name: %{base_name}
|
||||
Version: 1.79.0
|
||||
Version: 1.80.0
|
||||
Release: 0
|
||||
%define library_version 1_79_0
|
||||
%define library_version 1_80_0
|
||||
Summary: Boost C++ Libraries
|
||||
License: BSL-1.0
|
||||
Group: Development/Libraries/C and C++
|
||||
@ -265,8 +265,6 @@ Patch18: dynamic_linking.patch
|
||||
Patch20: python_library_name.patch
|
||||
Patch21: boost-remove-cmakedir.patch
|
||||
Patch22: boost-process.patch
|
||||
Patch23: https://www.boost.org/patches/1_79_0/0001-json-array-erase-relocate.patch
|
||||
Patch24: boost-mp-locale-fix.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gmp-devel
|
||||
BuildRequires: libbz2-devel
|
||||
@ -1260,8 +1258,6 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
%patch22 -p2
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
|
||||
%build
|
||||
find . -type f -exec chmod u+w {} +
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
|
||||
size 113456811
|
3
boost_1_80_0.tar.bz2
Normal file
3
boost_1_80_0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
|
||||
size 115869904
|
@ -1,7 +1,7 @@
|
||||
Index: boost_1_74_0/libs/test/build/Jamfile.v2
|
||||
Index: boost_1_80_0/libs/test/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_74_0.orig/libs/test/build/Jamfile.v2
|
||||
+++ boost_1_74_0/libs/test/build/Jamfile.v2
|
||||
--- boost_1_80_0.orig/libs/test/build/Jamfile.v2
|
||||
+++ boost_1_80_0/libs/test/build/Jamfile.v2
|
||||
@@ -95,7 +95,7 @@ lib boost_test_exec_monitor
|
||||
: # sources
|
||||
$(TEST_EXEC_MON_SOURCES).cpp
|
||||
@ -11,10 +11,10 @@ Index: boost_1_74_0/libs/test/build/Jamfile.v2
|
||||
: # default build
|
||||
: # usage-requirements
|
||||
<link>shared:<define>BOOST_TEST_DYN_LINK=1
|
||||
Index: boost_1_74_0/libs/exception/build/Jamfile.v2
|
||||
Index: boost_1_80_0/libs/exception/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_74_0.orig/libs/exception/build/Jamfile.v2
|
||||
+++ boost_1_74_0/libs/exception/build/Jamfile.v2
|
||||
--- boost_1_80_0.orig/libs/exception/build/Jamfile.v2
|
||||
+++ boost_1_80_0/libs/exception/build/Jamfile.v2
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
project boost/exception
|
||||
@ -24,11 +24,11 @@ Index: boost_1_74_0/libs/exception/build/Jamfile.v2
|
||||
;
|
||||
|
||||
lib boost_exception : clone_current_exception_non_intrusive.cpp ;
|
||||
Index: boost_1_74_0/libs/chrono/build/Jamfile.v2
|
||||
Index: boost_1_80_0/libs/chrono/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_74_0.orig/libs/chrono/build/Jamfile.v2
|
||||
+++ boost_1_74_0/libs/chrono/build/Jamfile.v2
|
||||
@@ -93,7 +93,7 @@ project boost/chrono
|
||||
--- boost_1_80_0.orig/libs/chrono/build/Jamfile.v2
|
||||
+++ boost_1_80_0/libs/chrono/build/Jamfile.v2
|
||||
@@ -90,7 +90,7 @@ project boost/chrono
|
||||
<toolset>sun:<define>__typeof__=__typeof__
|
||||
|
||||
<link>shared:<define>BOOST_CHRONO_DYN_LINK=1
|
||||
@ -37,7 +37,7 @@ Index: boost_1_74_0/libs/chrono/build/Jamfile.v2
|
||||
<toolset>gcc-3.4.4:<linkflags>--enable-auto-import
|
||||
<toolset>gcc-4.3.4:<linkflags>--enable-auto-import
|
||||
<toolset>gcc-4.4.0,<target-os>windows:<linkflags>--enable-auto-import
|
||||
@@ -107,7 +107,7 @@ lib boost_chrono
|
||||
@@ -104,7 +104,7 @@ lib boost_chrono
|
||||
: $(SOURCES).cpp
|
||||
:
|
||||
<link>shared:<define>BOOST_ALL_DYN_LINK=1 # tell source we're building dll's
|
||||
@ -46,10 +46,10 @@ Index: boost_1_74_0/libs/chrono/build/Jamfile.v2
|
||||
;
|
||||
|
||||
boost-install boost_chrono ;
|
||||
Index: boost_1_74_0/libs/system/build/Jamfile.v2
|
||||
Index: boost_1_80_0/libs/system/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_74_0.orig/libs/system/build/Jamfile.v2
|
||||
+++ boost_1_74_0/libs/system/build/Jamfile.v2
|
||||
--- boost_1_80_0.orig/libs/system/build/Jamfile.v2
|
||||
+++ boost_1_80_0/libs/system/build/Jamfile.v2
|
||||
@@ -11,7 +11,7 @@ project boost/system
|
||||
: source-location ../src
|
||||
: usage-requirements # pass these requirement to dependents (i.e. users)
|
||||
@ -68,10 +68,10 @@ Index: boost_1_74_0/libs/system/build/Jamfile.v2
|
||||
;
|
||||
|
||||
boost-install boost_system ;
|
||||
Index: boost_1_74_0/libs/timer/build/Jamfile.v2
|
||||
Index: boost_1_80_0/libs/timer/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_74_0.orig/libs/timer/build/Jamfile.v2
|
||||
+++ boost_1_74_0/libs/timer/build/Jamfile.v2
|
||||
--- boost_1_80_0.orig/libs/timer/build/Jamfile.v2
|
||||
+++ boost_1_80_0/libs/timer/build/Jamfile.v2
|
||||
@@ -13,7 +13,7 @@ project boost/timer
|
||||
<library>/boost/chrono//boost_chrono
|
||||
: usage-requirements # pass these requirement to dependants (i.e. users)
|
||||
@ -90,11 +90,11 @@ Index: boost_1_74_0/libs/timer/build/Jamfile.v2
|
||||
;
|
||||
|
||||
boost-install boost_timer ;
|
||||
Index: boost_1_74_0/libs/filesystem/build/Jamfile.v2
|
||||
Index: boost_1_80_0/libs/filesystem/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_74_0.orig/libs/filesystem/build/Jamfile.v2
|
||||
+++ boost_1_74_0/libs/filesystem/build/Jamfile.v2
|
||||
@@ -54,7 +54,7 @@ project boost/filesystem
|
||||
--- boost_1_80_0.orig/libs/filesystem/build/Jamfile.v2
|
||||
+++ boost_1_80_0/libs/filesystem/build/Jamfile.v2
|
||||
@@ -130,7 +130,7 @@ project boost/filesystem
|
||||
: source-location ../src
|
||||
: usage-requirements # pass these requirement to dependents (i.e. users)
|
||||
<link>shared:<define>BOOST_FILESYSTEM_DYN_LINK=1
|
||||
@ -103,7 +103,7 @@ Index: boost_1_74_0/libs/filesystem/build/Jamfile.v2
|
||||
;
|
||||
|
||||
SOURCES =
|
||||
@@ -157,7 +157,7 @@ lib boost_filesystem
|
||||
@@ -163,7 +163,7 @@ lib boost_filesystem
|
||||
<conditional>@select-platform-specific-sources
|
||||
<include>../src
|
||||
<link>shared:<define>BOOST_FILESYSTEM_DYN_LINK=1
|
||||
|
Loading…
Reference in New Issue
Block a user