pool/boost
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 629938 from home:adamm:boost_test

Browse Source 
- Update to version 1.68.0
  New libraries:
  * YAP: An expression template library for C++14 and later
  Breaking changes since 1.67.0:
  * uuid: sha1 detail namespace header redirection for backwards
    compatibility was removed
  * signals: Boost.Signals will be removed in the next release.
    Boost.Signals was deprecated in version 1.54.0.
    Transition to Boost.Signals2 now to avoid disruption.
  Updated libraries: Beast, Context, Coroutine2, Fiber, Fusion,
  Geometry, GIL, Graph, Lexical Cast, Log, Math,
  Multi-index containers, Optional, Predef, Program Options,
  Python, Rational, System, Stacktrace, Test, TypeIndex and Uuid.
  For complete list of changes, see
  https://www.boost.org/users/history/version_1_68_0.html
- refreshed patches: boost-no_type_punning.patch,
  python_library_name.patch
- dropped: python_numpy_retfunc.patch - no longer needed

OBS-URL: https://build.opensuse.org/request/show/629938
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=218
This commit is contained in:
Adam Majer 2018-08-17 13:44:12 +00:00 committed by Git OBS Bridge
parent 4b6dadea4f
commit bc55ed7b25
8 changed files with 78 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
baselibs.conf
View File

@ -1,26 +1,26 @@
libboost_atomic1_67_0
libboost_container1_67_0
libboost_context1_67_0
libboost_coroutine1_67_0
libboost_date_time1_67_0
libboost_fiber1_67_0
libboost_filesystem1_67_0
libboost_graph1_67_0
libboost_graph_parallel1_67_0
libboost_iostreams1_67_0
libboost_locale1_67_0
libboost_math1_67_0
libboost_mpi1_67_0
libboost_test1_67_0
libboost_program_options1_67_0
libboost_python-py2_7-1_67_0
libboost_python-py3-1_67_0
libboost_random1_67_0
libboost_serialization1_67_0
libboost_signals1_67_0
libboost_stacktrace1_67_0
libboost_system1_67_0
libboost_thread1_67_0
libboost_type_erasure1_67_0
libboost_wave1_67_0
libboost_regex1_67_0
libboost_atomic1_68_0
libboost_container1_68_0
libboost_context1_68_0
libboost_coroutine1_68_0
libboost_date_time1_68_0
libboost_fiber1_68_0
libboost_filesystem1_68_0
libboost_graph1_68_0
libboost_graph_parallel1_68_0
libboost_iostreams1_68_0
libboost_locale1_68_0
libboost_math1_68_0
libboost_mpi1_68_0
libboost_test1_68_0
libboost_program_options1_68_0
libboost_python-py2_7-1_68_0
libboost_python-py3-1_68_0
libboost_random1_68_0
libboost_serialization1_68_0
libboost_signals1_68_0
libboost_stacktrace1_68_0
libboost_system1_68_0
libboost_thread1_68_0
libboost_type_erasure1_68_0
libboost_wave1_68_0
libboost_regex1_68_0

32
boost-no_type_punning.patch
View File

@ -1,7 +1,7 @@
Index: libs/python/src/dict.cpp
===================================================================
--- libs/python/src/dict.cpp.orig 2009-10-14 00:37:59.000000000 +0200
+++ libs/python/src/dict.cpp 2012-03-13 17:20:34.286172759 +0100
--- libs/python/src/dict.cpp.orig
+++ libs/python/src/dict.cpp
@@ -28,9 +28,9 @@ namespace
detail::new_reference dict_base::call(object const& arg_)
@ -16,8 +16,8 @@ Index: libs/python/src/dict.cpp
dict_base::dict_base()
Index: libs/python/src/list.cpp
===================================================================
--- libs/python/src/list.cpp.orig 2009-10-14 00:37:59.000000000 +0200
+++ libs/python/src/list.cpp 2012-03-13 17:20:34.286172759 +0100
--- libs/python/src/list.cpp.orig
+++ libs/python/src/list.cpp
@@ -10,11 +10,11 @@ namespace boost { namespace python { nam
detail::new_non_null_reference list_base::call(object const& arg_)
@ -34,8 +34,8 @@ Index: libs/python/src/list.cpp
list_base::list_base()
Index: libs/python/src/long.cpp
===================================================================
--- libs/python/src/long.cpp.orig 2009-08-17 23:01:18.000000000 +0200
+++ libs/python/src/long.cpp 2012-03-13 17:20:34.287172735 +0100
--- libs/python/src/long.cpp.orig
+++ libs/python/src/long.cpp
@@ -8,16 +8,16 @@ namespace boost { namespace python { nam
new_non_null_reference long_base::call(object const& arg_)
@ -73,8 +73,8 @@ Index: libs/python/src/long.cpp
: object(long_base::call(arg))
Index: libs/python/src/object/class.cpp
===================================================================
--- libs/python/src/object/class.cpp.orig 2011-06-07 06:15:33.000000000 +0200
+++ libs/python/src/object/class.cpp 2012-03-13 17:20:34.287172735 +0100
--- libs/python/src/object/class.cpp.orig
+++ libs/python/src/object/class.cpp
@@ -616,9 +616,11 @@ namespace objects
void class_base::add_property(
char const* name, object const& fget, char const* docstr)
@ -83,8 +83,8 @@ Index: libs/python/src/object/class.cpp
+
object property(
(python::detail::new_reference)
- PyObject_CallFunction((PyObject*)&PyProperty_Type, const_cast<char*>("Osss"), fget.ptr(), 0, 0, docstr));
+ PyObject_CallFunction(pun.pop, const_cast<char*>("Osss"), fget.ptr(), 0, 0, docstr));
- PyObject_CallFunction((PyObject*)&PyProperty_Type, const_cast<char*>("Osss"), fget.ptr(), (char*)NULL, (char*)NULL, docstr));
+ PyObject_CallFunction(pun.pop, const_cast<char*>("Osss"), fget.ptr(), (char*)NULL, (char*)NULL, docstr));
this->setattr(name, property);
}
@ -96,15 +96,15 @@ Index: libs/python/src/object/class.cpp
+
object property(
(python::detail::new_reference)
- PyObject_CallFunction((PyObject*)&PyProperty_Type, const_cast<char*>("OOss"), fget.ptr(), fset.ptr(), 0, docstr));
+ PyObject_CallFunction(pun.pop, const_cast<char*>("OOss"), fget.ptr(), fset.ptr(), 0, docstr));
- PyObject_CallFunction((PyObject*)&PyProperty_Type, const_cast<char*>("OOss"), fget.ptr(), fset.ptr(), (char*)NULL, docstr));
+ PyObject_CallFunction(pun.pop, const_cast<char*>("OOss"), fget.ptr(), fset.ptr(), (char*)NULL, docstr));
this->setattr(name, property);
}
Index: libs/python/src/str.cpp
===================================================================
--- libs/python/src/str.cpp.orig 2009-10-14 00:37:59.000000000 +0200
+++ libs/python/src/str.cpp 2012-03-13 17:20:34.287172735 +0100
--- libs/python/src/str.cpp.orig
+++ libs/python/src/str.cpp
@@ -9,14 +9,14 @@ namespace boost { namespace python { nam
detail::new_reference str_base::call(object const& arg_)
@ -127,8 +127,8 @@ Index: libs/python/src/str.cpp
str_base::str_base()
Index: libs/python/src/tuple.cpp
===================================================================
--- libs/python/src/tuple.cpp.orig 2009-08-17 23:01:18.000000000 +0200
+++ libs/python/src/tuple.cpp 2012-03-13 17:20:34.287172735 +0100
--- libs/python/src/tuple.cpp.orig
+++ libs/python/src/tuple.cpp
@@ -8,9 +8,10 @@ namespace boost { namespace python { nam
detail::new_reference tuple_base::call(object const& arg_)

25
boost.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Fri Aug 10 12:48:51 UTC 2018 - adam.majer@suse.de
- Update to version 1.68.0
New libraries:
* YAP: An expression template library for C++14 and later
Breaking changes since 1.67.0:
* uuid: sha1 detail namespace header redirection for backwards
compatibility was removed
* signals: Boost.Signals will be removed in the next release.
Boost.Signals was deprecated in version 1.54.0.
Transition to Boost.Signals2 now to avoid disruption.
Updated libraries: Beast, Context, Coroutine2, Fiber, Fusion,
Geometry, GIL, Graph, Lexical Cast, Log, Math,
Multi-index containers, Optional, Predef, Program Options,
Python, Rational, System, Stacktrace, Test, TypeIndex and Uuid.
For complete list of changes, see
https://www.boost.org/users/history/version_1_68_0.html
- refreshed patches: boost-no_type_punning.patch,
python_library_name.patch
- dropped: python_numpy_retfunc.patch - no longer needed
-------------------------------------------------------------------
Tue Jul 3 11:53:07 UTC 2018 - adam.majer@suse.de

12
boost.spec
View File

@ -16,11 +16,11 @@
#
%define ver 1.67.0
%define file_version 1_67_0
%define ver 1.68.0
%define file_version 1_68_0
%define docs_version 1.56.0
%define short_version 1_56
%define lib_appendix 1_67_0
%define lib_appendix 1_68_0
%bcond_with build_docs
%bcond_without package_pdf
%bcond_without build_quickbook
@ -80,8 +80,8 @@
%endif
Name: boost%name_suffix
%define package_name boost_1_67
Version: 1.67.0
%define package_name boost_1_68
Version: 1.68.0
Release: 0
Summary: Boost C++ Libraries
License: BSL-1.0
@ -113,7 +113,6 @@ Patch16: boost-1.55.0-python-test-PyImport_AppendInittab.patch
Patch17: python_mpi.patch
Patch18: dynamic_linking.patch
Patch20: python_library_name.patch
Patch21: python_numpy_retfunc.patch
BuildRequires: fdupes
BuildRequires: libbz2-devel
BuildRequires: libexpat-devel
@ -1123,7 +1122,6 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
%patch17 -p1
%patch18 -p1
%patch20 -p1
%patch21 -p1
%build
find . -type f -exec chmod u+w {} +

3
boost_1_67_0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba
size 87336566

3
boost_1_68_0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7
size 92155315

88
python_library_name.patch
View File

@ -27,92 +27,10 @@ MPI module needs to reference correct python
~ <library>boost_mpi_python
~ <library>boost_mpi
~ <library>/mpi//mpi [ mpi.extra-requirements ]
Index: boost_1_67_0/libs/mpi/build/Jamfile.v2
Index: boost_1_68_0/libs/python/Jamfile
===================================================================
--- boost_1_67_0.orig/libs/mpi/build/Jamfile.v2
+++ boost_1_67_0/libs/mpi/build/Jamfile.v2
@@ -60,33 +60,13 @@ libraries += boost_mpi ;
if [ python.configured ]
{
- py2-version = [ py-version 2 ] ;
- py3-version = [ py-version 3 ] ;
-
- # These library names are synchronized with those defined by Boost.Python, see libs/python/build/Jamfile.
- lib_boost_python(2) = boost_python ;
- lib_boost_python(3) = boost_python3 ;
-
- lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
- lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
-
- lib_boost_mpi_python(2) = boost_mpi_python ;
- lib_boost_mpi_python(3) = boost_mpi_python3 ;
-
- lib_boost_mpi_python($(py2-version)) = $(lib_boost_mpi_python(2)) ;
- lib_boost_mpi_python($(py3-version)) = $(lib_boost_mpi_python(3)) ;
-
- for local N in 2 3
- {
- if $(py$(N)-version)
- {
- lib $(lib_boost_mpi_python($(py$(N)-version)))
+ lib boost_mpi_python
: # Sources
python/serialize.cpp
: # Requirements
<library>boost_mpi
<library>/mpi//mpi [ mpi.extra-requirements ]
- <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
+ <library>/boost/python//boost_python
<link>shared:<define>BOOST_MPI_DYN_LINK=1
<link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
<link>shared:<define>BOOST_PYTHON_DYN_LINK=1
@@ -94,12 +74,12 @@ libraries += boost_mpi ;
-<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
- <python>$(py$(N)-version)
: # Default build
<link>shared
: # Usage requirements
<library>/mpi//mpi [ mpi.extra-requirements ]
;
+ libraries += boost_mpi_python ;
python-extension mpi
: # Sources
@@ -116,8 +96,8 @@ libraries += boost_mpi ;
python/status.cpp
python/py_timer.cpp
: # Requirements
- <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
- <library>$(lib_boost_mpi_python($(py$(N)-version)))
+ <library>/boost/python//boost_python
+ <library>boost_mpi_python
<library>boost_mpi
<library>/mpi//mpi [ mpi.extra-requirements ]
<link>shared:<define>BOOST_MPI_DYN_LINK=1
@@ -125,16 +105,7 @@ libraries += boost_mpi ;
<link>shared:<define>BOOST_PYTHON_DYN_LINK=1
<link>shared <runtime-link>shared
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
- <python>$(py$(N)-version)
;
-
- libraries += $(lib_boost_mpi_python($(py$(N)-version))) ;
- }
- else
- {
- alias $(lib_boost_mpi_python($(N))) ;
- }
- }
}
}
else if ! ( --without-mpi in [ modules.peek : ARGV ] )
Index: boost_1_67_0/libs/python/Jamfile
===================================================================
--- boost_1_67_0.orig/libs/python/Jamfile
+++ boost_1_67_0/libs/python/Jamfile
--- boost_1_68_0.orig/libs/python/Jamfile
+++ boost_1_68_0/libs/python/Jamfile
@@ -36,9 +36,10 @@ local rule split-version ( version )
# For example, Boost.Python built for Python 2.7 uses the suffix "27"
rule version-suffix ( version )

22
python_numpy_retfunc.patch
View File

@ -1,22 +0,0 @@
Author: Adam Majer <amajer@suse.de>
Date: Tue Apr 4 10:18:49 CEST 2017
Summary: rpmlint fixes?
After build, the following errors were returned.
[ 110s] libs/python/src/numpy/numpy.cpp: In function 'void* boost::python::numpy::wrap_import_array()':
[ 110s] libs/python/src/numpy/numpy.cpp:22:1: warning: control reaches end of non-void function [-Wreturn-type]
[ 110s] }
Index: boost_1_64_0/libs/python/src/numpy/numpy.cpp
===================================================================
--- boost_1_64_0.orig/libs/python/src/numpy/numpy.cpp
+++ boost_1_64_0/libs/python/src/numpy/numpy.cpp
@@ -19,6 +19,7 @@ static void wrap_import_array()
static void * wrap_import_array()
{
import_array();
+ return NULL; // import_array no longer auto-returns?
}
#endif