boost/python_library_name.patch
Adam Majer e1c5a89560 Accepting request 489639 from home:adamm:branches:devel:libraries:c_c++
- New upstream version 1.64.0
  + process - new library providing cross platform methods to
    - create child processes
    - setup stream for child processes
    - sync and async communication streams with children
    - sync and async wait
    - process termination
  + geometry library had some breaking changes,
    - ublas_transformer is renamed to matrix_transformer
    - explicit modifier is added to constructors of rtree
      index::dynamic_* parameters
    - strategy::area::huiller replaced by strategy::area::spherical
  + context library updates
    - deprecated API:execution-context
    - fixed bad assembly for fcontext on ppc64/sysv/elf
  + Updated libraries: any, atomic, config, container, context,
    conversion, core, coroutine2, fiber, hash, interprocess,
    intrusive, lexicalcast, math, multi-index containers,
    multiprecision, predef, program options, regex, smart pointers,
    test ,typeindex, typetraits, unordered, variant
  + for details, see 
    http://www.boost.org/users/history/version_1_64_0.html
- Build PyNumpy module
  + add build requires on python-numpy
- test_lowcase.patch: upstreamed
- refreshed patches: boost-strict_aliasing.patch, gcc_path.patch,
  python_mpi.patch
- mpi_upstream.patch: pending upstream fixes to OpenMPI build
- python_library_name.patch: we are building python versions in
  different stagings so drop library renames.

OBS-URL: https://build.opensuse.org/request/show/489639
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=194
2017-04-21 12:48:16 +00:00

95 lines
3.2 KiB
Diff

Python module needs to be built without these extra renames.
MPI module needs to reference correct python
~Index: boost_1_64_0/libs/mpi/build/Jamfile.v2
~===================================================================
~--- boost_1_64_0.orig/libs/mpi/build/Jamfile.v2
~+++ boost_1_64_0/libs/mpi/build/Jamfile.v2
~@@ -61,10 +61,10 @@ libraries += boost_mpi ;
~ lib boost_mpi_python
~ : # Sources
~ python/serialize.cpp
~+ /user-config//boost_python_alias
~ : # Requirements
~ <library>boost_mpi
~ <library>/mpi//mpi [ mpi.extra-requirements ]
~- <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
~@@ -92,8 +92,8 @@ libraries += boost_mpi ;
~ python/skeleton_and_content.cpp
~ python/status.cpp
~ python/py_timer.cpp
~+ /user-config//boost_python_alias
~ : # Requirements
~- <library>/boost/python//boost_python
~ <library>boost_mpi_python
~ <library>boost_mpi
~ <library>/mpi//mpi [ mpi.extra-requirements ]
Index: boost_1_64_0/libs/python/build/Jamfile
===================================================================
--- boost_1_64_0.orig/libs/python/build/Jamfile
+++ boost_1_64_0/libs/python/build/Jamfile
@@ -42,15 +42,15 @@ rule cond ( test ? : yes * : no * ) { if
rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
local rule eq ( a : b ) { if $(a) = $(b) { return 1 ; } }
-lib_boost_python(2) = boost_python ;
-lib_boost_python(3) = boost_python3 ;
+#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_python($(py2-version)) = $(lib_boost_python(2)) ;
+#lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
rule lib_boost_python ( version )
{
- lib $(lib_boost_python($(version)))
+ lib boost_python #$(lib_boost_python($(version)))
: # sources
numeric.cpp
list.cpp
@@ -122,16 +122,16 @@ rule lib_boost_python ( version )
;
}
-lib_boost_numpy(2) = boost_numpy ;
-lib_boost_numpy(3) = boost_numpy3 ;
+#lib_boost_numpy(2) = boost_numpy ;
+#lib_boost_numpy(3) = boost_numpy3 ;
-lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ;
-lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ;
+#lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ;
+#lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ;
rule lib_boost_numpy ( version )
{
numpy-include = [ python.numpy-include ] ;
- lib $(lib_boost_numpy($(version)))
+ lib boost_numpy #$(lib_boost_numpy($(version)))
: # sources
numpy/dtype.cpp
numpy/matrix.cpp
@@ -173,7 +173,7 @@ for local N in 2 3
}
else
{
- alias $(lib_boost_python($(N))) ;
+ #alias $(lib_boost_python($(N))) ;
}
if $(py$(N)-version) && [ python.numpy ]
{
@@ -182,7 +182,7 @@ for local N in 2 3
}
else
{
- alias $(lib_boost_numpy($(N))) ;
+ #alias $(lib_boost_numpy($(N))) ;
}
}