Compare commits
2 Commits
| Author | SHA1 | Date |
|---|---|---|
Jonathan Wakely
|
acdfc457e2 | |
|
Jonathan Wakely
|
ceafcbae48 |
|
|
@ -1,39 +0,0 @@
|
|||
From 660487c43fde76f3e64f1cb2e644500da92fe582 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
|
||||
Date: Fri, 9 Feb 2018 18:20:30 +0100
|
||||
Subject: [PATCH] Fix build with Python 3.7
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Python 3.7 changes the return type of _PyUnicode_AsString()
|
||||
from void* to const char* -- causing the build of boost-python
|
||||
to fail.
|
||||
|
||||
Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
|
||||
---
|
||||
src/converter/builtin_converters.cpp | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/converter/builtin_converters.cpp b/src/converter/builtin_converters.cpp
|
||||
index 1c28af7fc..ee2d5b479 100644
|
||||
--- a/libs/python/src/converter/builtin_converters.cpp
|
||||
+++ b/libs/python/src/converter/builtin_converters.cpp
|
||||
@@ -45,11 +45,16 @@ namespace
|
||||
{
|
||||
return PyString_Check(obj) ? PyString_AsString(obj) : 0;
|
||||
}
|
||||
-#else
|
||||
+#elif PY_VERSION_HEX < 0x03070000
|
||||
void* convert_to_cstring(PyObject* obj)
|
||||
{
|
||||
return PyUnicode_Check(obj) ? _PyUnicode_AsString(obj) : 0;
|
||||
}
|
||||
+#else
|
||||
+ void* convert_to_cstring(PyObject* obj)
|
||||
+ {
|
||||
+ return PyUnicode_Check(obj) ? const_cast<void*>(reinterpret_cast<const void*>(_PyUnicode_AsString(obj))) : 0;
|
||||
+ }
|
||||
#endif
|
||||
|
||||
// Given a target type and a SlotPolicy describing how to perform a
|
||||
245
boost.spec
245
boost.spec
|
|
@ -23,7 +23,6 @@
|
|||
%bcond_without context
|
||||
%endif
|
||||
|
||||
%bcond_without python2
|
||||
%bcond_without python3
|
||||
|
||||
%ifnarch %{ix86} x86_64
|
||||
|
|
@ -36,23 +35,23 @@ Name: boost
|
|||
Summary: The free peer-reviewed portable C++ source libraries
|
||||
Version: 1.66.0
|
||||
%global version_enc 1_66_0
|
||||
Release: 11%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: Boost and MIT and Python
|
||||
|
||||
%global toplev_dirname %{name}_%{version_enc}
|
||||
URL: http://www.boost.org
|
||||
|
||||
Source0: https://sourceforge.net/projects/boost/files/boost/%{version}/%{toplev_dirname}.tar.bz2
|
||||
Source1: libboost_thread.so
|
||||
Source1: ver.py
|
||||
Source2: libboost_thread.so
|
||||
|
||||
# Since Fedora 13, the Boost libraries are delivered with sonames
|
||||
# equal to the Boost version (e.g., 1.41.0).
|
||||
%global sonamever %{version}
|
||||
|
||||
# boost is an "umbrella" package that pulls in all boost shared library
|
||||
# components, except for MPI and Python sub-packages. Those are special
|
||||
# in that there are alternative implementations to choose from
|
||||
# (Open MPI and MPICH, and Python 2 and 3), and it's not a big burden
|
||||
# components, except for MPI and Python 3 sub-packages. Those are
|
||||
# special in that they are rarely necessary, and it's not a big burden
|
||||
# to have interested parties install them explicitly.
|
||||
# The subpackages that don't install shared libraries are also not pulled in
|
||||
# (doc, doctools, examples, jam, static).
|
||||
|
|
@ -73,7 +72,9 @@ Requires: boost-iostreams%{?_isa} = %{version}-%{release}
|
|||
Requires: boost-locale%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-log%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-math%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-numpy%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-program-options%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-python%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-random%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-regex%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
|
|
@ -90,10 +91,8 @@ BuildRequires: m4
|
|||
BuildRequires: libstdc++-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: zlib-devel
|
||||
%if %{with python2}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python2-numpy
|
||||
%endif
|
||||
%if %{with python3}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-numpy
|
||||
|
|
@ -143,9 +142,6 @@ Patch84: boost-1.66.0-spirit-abs-overflow.patch
|
|||
# https://bugzilla.redhat.com/show_bug.cgi?id=1585515
|
||||
Patch85: boost-1.66.0-compute.patch
|
||||
|
||||
# https://github.com/boostorg/python/pull/186
|
||||
Patch86: boost-1.66.0-python37.patch
|
||||
|
||||
%bcond_with tests
|
||||
%bcond_with docs_generated
|
||||
|
||||
|
|
@ -280,17 +276,12 @@ Summary: Math functions for boost TR1 library
|
|||
Run-time support for C99 and C++ TR1 C-style Functions from the math
|
||||
portion of Boost.TR1.
|
||||
|
||||
%if %{with python2}
|
||||
|
||||
%package numpy2
|
||||
Summary: Run-time component of boost numpy library for Python 2
|
||||
Requires: boost-python2%{?_isa} = %{version}-%{release}
|
||||
%package numpy
|
||||
Summary: Run-time component of boost python numpy extension
|
||||
Requires: boost-python%{?_isa} = %{version}-%{release}
|
||||
Requires: python2-numpy
|
||||
# Added for F29, remove for F31:
|
||||
Provides: boost-numpy%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: boost-numpy < %{version}-%{release}
|
||||
|
||||
%description numpy2
|
||||
%description numpy
|
||||
|
||||
The Boost Python Library is a framework for interfacing Python and
|
||||
C++. It allows you to quickly and seamlessly expose C++ classes,
|
||||
|
|
@ -298,8 +289,6 @@ functions and objects to Python, and vice versa, using no special
|
|||
tools -- just your C++ compiler. This package contains run-time
|
||||
support for the NumPy extension of the Boost Python Library for Python 2.
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
|
||||
%package numpy3
|
||||
|
|
@ -326,15 +315,13 @@ Run-time support of boost program options library, which allows program
|
|||
developers to obtain (name, value) pairs from the user, via
|
||||
conventional methods such as command-line and configuration file.
|
||||
|
||||
%if %{with python2}
|
||||
|
||||
%package python2
|
||||
# These Provides: and Obsoletes: were added for F28, remove for F30
|
||||
# Remove before F30
|
||||
Provides: %{name}-python = %{version}-%{release}
|
||||
Provides: %{name}-python%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: %{name}-python < %{version}-%{release}
|
||||
Obsoletes: python2-%{name} < %{version}-%{release}
|
||||
Summary: Run-time component of boost python library for Python 2
|
||||
Summary: Run-time component of boost python library
|
||||
|
||||
%description python2
|
||||
|
||||
|
|
@ -344,21 +331,6 @@ functions and objects to Python, and vice versa, using no special
|
|||
tools -- just your C++ compiler. This package contains run-time
|
||||
support for the Boost Python Library compiled for Python 2.
|
||||
|
||||
%package python2-devel
|
||||
Summary: Shared object symbolic links for Boost.Python 2
|
||||
Requires: boost-numpy2%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-python2%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-devel%{?_isa} = %{version}-%{release}
|
||||
# These Provides: and Obsoletes: were added for F28, remove them for F30
|
||||
Provides: boost-python-devel%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: boost-python-devel < %{version}-%{release}
|
||||
|
||||
%description python2-devel
|
||||
|
||||
Shared object symbolic links for Python 2 variant of Boost.Python.
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
|
||||
%package python3
|
||||
|
|
@ -484,17 +456,28 @@ preprocessor functionality.
|
|||
%package devel
|
||||
Summary: The Boost C++ headers and shared development libraries
|
||||
Requires: boost%{?_isa} = %{version}-%{release}
|
||||
Provides: boost-python-devel
|
||||
Requires: libicu-devel%{?_isa}
|
||||
%if %{with quadmath}
|
||||
Requires: libquadmath-devel%{?_isa}
|
||||
%endif
|
||||
|
||||
# Odeint was shipped in Fedora 18, but later became part of Boost.
|
||||
# Note we also obsolete odeint-doc down there.
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=892850
|
||||
Provides: odeint = 2.2-5
|
||||
Obsoletes: odeint < 2.2-5
|
||||
Provides: odeint-devel = 2.2-5
|
||||
Obsoletes: odeint-devel < 2.2-5
|
||||
|
||||
%description devel
|
||||
Headers and shared object symbolic links for the Boost C++ libraries.
|
||||
|
||||
%package static
|
||||
Summary: The Boost C++ static development libraries
|
||||
Requires: boost-devel%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: boost-devel-static < 1.34.1-14
|
||||
Provides: boost-devel-static = %{version}-%{release}
|
||||
|
||||
%description static
|
||||
Static Boost C++ libraries.
|
||||
|
|
@ -504,6 +487,11 @@ Summary: HTML documentation for the Boost C++ libraries
|
|||
%if 0%{?rhel} >= 6
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
Provides: boost-python-docs = %{version}-%{release}
|
||||
|
||||
# See the description above.
|
||||
Provides: odeint-doc = 2.2-5
|
||||
Obsoletes: odeint-doc < 2.2-5
|
||||
|
||||
%description doc
|
||||
This package contains the documentation in the HTML format of the Boost C++
|
||||
|
|
@ -537,6 +525,7 @@ API over the OpenMPI implementation of MPI.
|
|||
Summary: Shared library symbolic links for Boost.MPI
|
||||
Requires: boost-devel%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-openmpi%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-openmpi-python%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-graph-openmpi%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description openmpi-devel
|
||||
|
|
@ -544,36 +533,18 @@ Requires: boost-graph-openmpi%{?_isa} = %{version}-%{release}
|
|||
Devel package for Boost.MPI-OpenMPI, a library providing a clean C++
|
||||
API over the OpenMPI implementation of MPI.
|
||||
|
||||
%if %{with python2}
|
||||
|
||||
%package openmpi-python2
|
||||
Summary: Python 2 run-time component of Boost.MPI library
|
||||
%package openmpi-python
|
||||
Summary: Python run-time component of Boost.MPI library
|
||||
Requires: boost-openmpi%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-python%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
Requires: python2-openmpi%{?_isa}
|
||||
# Added for F29, remove for F31:
|
||||
Provides: boost-openmpi-python%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: boost-openmpi-python < %{version}-%{release}
|
||||
|
||||
%description openmpi-python2
|
||||
%description openmpi-python
|
||||
|
||||
Python 2 support for Boost.MPI-OpenMPI, a library providing a clean C++
|
||||
API over the OpenMPI implementation of MPI.
|
||||
|
||||
%package openmpi-python2-devel
|
||||
Summary: Shared library symbolic links for Boost.MPI Python 2 component
|
||||
Requires: boost-devel%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-openmpi-devel%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-openmpi-python2%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description openmpi-python2-devel
|
||||
|
||||
Devel package for the Python 2 interface of Boost.MPI-OpenMPI, a library
|
||||
providing a clean C++ API over the OpenMPI implementation of MPI.
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
|
||||
%package openmpi-python3
|
||||
|
|
@ -623,6 +594,8 @@ back-end to do the parallel work.
|
|||
Summary: Run-time component of Boost.MPI library
|
||||
BuildRequires: mpich-devel
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
Provides: boost-mpich2 = %{version}-%{release}
|
||||
Obsoletes: boost-mpich2 < 1.53.0-9
|
||||
|
||||
%description mpich
|
||||
|
||||
|
|
@ -633,43 +606,30 @@ API over the MPICH implementation of MPI.
|
|||
Summary: Shared library symbolic links for Boost.MPI
|
||||
Requires: boost-devel%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-mpich%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-mpich-python%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-graph-mpich%{?_isa} = %{version}-%{release}
|
||||
Provides: boost-mpich2-devel = %{version}-%{release}
|
||||
Obsoletes: boost-mpich2-devel < 1.53.0-9
|
||||
|
||||
%description mpich-devel
|
||||
|
||||
Devel package for Boost.MPI-MPICH, a library providing a clean C++
|
||||
API over the MPICH implementation of MPI.
|
||||
|
||||
%if %{with python2}
|
||||
|
||||
%package mpich-python2
|
||||
%package mpich-python
|
||||
Summary: Python run-time component of Boost.MPI library
|
||||
Requires: boost-mpich%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-python2%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-python%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
Provides: boost-mpich2-python = %{version}-%{release}
|
||||
Obsoletes: boost-mpich2-python < 1.53.0-9
|
||||
Requires: python2-mpich%{?_isa}
|
||||
# Added for F29, remove for F31:
|
||||
Provides: boost-mpich-python%{?_isa} = %{version}-%{release}
|
||||
Obsoletes: boost-mpich-python < %{version}-%{release}
|
||||
|
||||
%description mpich-python2
|
||||
%description mpich-python
|
||||
|
||||
Python 2 support for Boost.MPI-MPICH, a library providing a clean C++
|
||||
API over the MPICH implementation of MPI.
|
||||
|
||||
%package mpich-python2-devel
|
||||
Summary: Shared library symbolic links for Boost.MPI Python 2 component
|
||||
Requires: boost-devel%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-mpich-devel%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-mpich-python2%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description mpich-python2-devel
|
||||
|
||||
Devel package for the Python 2 interface of Boost.MPI-MPICH, a library
|
||||
providing a clean C++ API over the MPICH implementation of MPI.
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
|
||||
%package mpich-python3
|
||||
|
|
@ -702,6 +662,8 @@ providing a clean C++ API over the MPICH implementation of MPI.
|
|||
Summary: Run-time component of parallel boost graph library
|
||||
Requires: boost-mpich%{?_isa} = %{version}-%{release}
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
Provides: boost-graph-mpich2 = %{version}-%{release}
|
||||
Obsoletes: boost-graph-mpich2 < 1.53.0-9
|
||||
|
||||
%description graph-mpich
|
||||
|
||||
|
|
@ -759,17 +721,20 @@ find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x
|
|||
%patch83 -p1
|
||||
%patch84 -p1
|
||||
%patch85 -p2
|
||||
%patch86 -p1
|
||||
|
||||
# At least python2_version needs to be a macro so that it's visible in
|
||||
# %%install as well.
|
||||
%global python2_version %(/usr/bin/python2 %{SOURCE1})
|
||||
%if %{with python3}
|
||||
%global python3_version %(/usr/bin/python3 %{SOURCE1})
|
||||
%global python3_abiflags %(/usr/bin/python3-config --abiflags)
|
||||
%endif
|
||||
|
||||
%build
|
||||
# Dump the versions being used into the build logs.
|
||||
%if %{with python2}
|
||||
: PYTHON2_VERSION=%{python2_version}
|
||||
%endif
|
||||
%if %{with python3}
|
||||
PYTHON3_ABIFLAGS=$(/usr/bin/python3-config --abiflags)
|
||||
: PYTHON3_VERSION=%{python3_version}
|
||||
: PYTHON3_ABIFLAGS=${PYTHON3_ABIFLAGS}
|
||||
: PYTHON3_ABIFLAGS=%{python3_abiflags}
|
||||
%endif
|
||||
|
||||
# There are many strict aliasing warnings, and it's not feasible to go
|
||||
|
|
@ -787,9 +752,7 @@ using gcc : : : <compileflags>$(RPM_OPT_FLAGS) <linkflags>$(RPM_LD_FLAGS) ;
|
|||
%if %{with openmpi} || %{with mpich}
|
||||
using mpi ;
|
||||
%endif
|
||||
%if %{with python2}
|
||||
using python : %{python2_version} : /usr/bin/python2 : /usr/include/python%{python2_version} : : : : ;
|
||||
%endif
|
||||
EOF
|
||||
|
||||
./bootstrap.sh --with-toolset=gcc --with-icu
|
||||
|
|
@ -805,15 +768,9 @@ echo ============================= build serial ==================
|
|||
%if !%{with context}
|
||||
--without-context --without-coroutine \
|
||||
--without-fiber \
|
||||
%endif
|
||||
%if !%{with python2}
|
||||
--without-python \
|
||||
%endif
|
||||
variant=release threading=multi debug-symbols=on pch=off \
|
||||
%if %{with python2}
|
||||
python=%{python2_version} \
|
||||
%endif
|
||||
stage
|
||||
python=%{python2_version} stage
|
||||
|
||||
# See libs/thread/build/Jamfile.v2 for where this file comes from.
|
||||
if [ $(find serial -type f -name has_atomic_flag_lockfree \
|
||||
|
|
@ -824,7 +781,7 @@ else
|
|||
fi
|
||||
|
||||
m4 -${DEF}HAS_ATOMIC_FLAG_LOCKFREE -DVERSION=%{version} \
|
||||
%{SOURCE1} > $(basename %{SOURCE1})
|
||||
%{SOURCE2} > $(basename %{SOURCE2})
|
||||
|
||||
%if %{with python3}
|
||||
|
||||
|
|
@ -842,10 +799,7 @@ using gcc : : : <compileflags>$(RPM_OPT_FLAGS) <linkflags>$(RPM_LD_FLAGS) ;
|
|||
%if %{with openmpi} || %{with mpich}
|
||||
using mpi ;
|
||||
%endif
|
||||
EOF
|
||||
|
||||
cat >> python3-config.jam << EOF
|
||||
using python : %{python3_version} : /usr/bin/python3 : /usr/include/python%{python3_version}${PYTHON3_ABIFLAGS} : : : : ${PYTHON3_ABIFLAGS} ;
|
||||
using python : %{python3_version} : /usr/bin/python3 : /usr/include/python%{python3_version}%{python3_abiflags} : : : : %{python3_abiflags} ;
|
||||
EOF
|
||||
|
||||
echo ============================= build serial-py3 ==================
|
||||
|
|
@ -867,13 +821,11 @@ module purge ||:
|
|||
|
||||
%if %{with openmpi}
|
||||
%{_openmpi_load}
|
||||
%if %{with python2}
|
||||
echo ============================= build $MPI_COMPILER ==================
|
||||
./b2 -d+2 -q %{?_smp_mflags} \
|
||||
--with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \
|
||||
variant=release threading=multi debug-symbols=on pch=off \
|
||||
python=%{python2_version} stage
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
echo ============================= build $MPI_COMPILER-py3 ==================
|
||||
|
|
@ -891,13 +843,11 @@ export PATH=/bin${PATH:+:}$PATH
|
|||
# Build MPI parts of Boost with MPICH support
|
||||
%if %{with mpich}
|
||||
%{_mpich_load}
|
||||
%if %{with python2}
|
||||
echo ============================= build $MPI_COMPILER ==================
|
||||
./b2 -d+2 -q %{?_smp_mflags} \
|
||||
--with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \
|
||||
variant=release threading=multi debug-symbols=on pch=off \
|
||||
python=%{python2_version} stage
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
echo ============================= build $MPI_COMPILER-py3 ==================
|
||||
|
|
@ -933,7 +883,6 @@ module purge ||:
|
|||
%{_openmpi_load}
|
||||
# XXX We want to extract this from RPM flags
|
||||
# b2 instruction-set=i686 etc.
|
||||
%if %{with python2}
|
||||
echo ============================= install $MPI_COMPILER ==================
|
||||
./b2 -q %{?_smp_mflags} \
|
||||
--with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \
|
||||
|
|
@ -946,7 +895,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{python2_sitearch}/openmpi/boost
|
|||
touch ${RPM_BUILD_ROOT}%{python2_sitearch}/openmpi/boost/__init__.py
|
||||
mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/mpi.so \
|
||||
${RPM_BUILD_ROOT}%{python2_sitearch}/openmpi/boost/
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
echo ============================= install $MPI_COMPILER-py3 ==================
|
||||
|
|
@ -973,7 +921,6 @@ export PATH=/bin${PATH:+:}$PATH
|
|||
|
||||
%if %{with mpich}
|
||||
%{_mpich_load}
|
||||
%if %{with python2}
|
||||
echo ============================= install $MPI_COMPILER ==================
|
||||
./b2 -q %{?_smp_mflags} \
|
||||
--with-mpi --with-graph_parallel --build-dir=$MPI_COMPILER \
|
||||
|
|
@ -986,7 +933,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{python2_sitearch}/mpich/boost
|
|||
touch ${RPM_BUILD_ROOT}%{python2_sitearch}/mpich/boost/__init__.py
|
||||
mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/mpi.so \
|
||||
${RPM_BUILD_ROOT}%{python2_sitearch}/mpich/boost/
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
echo ============================= install $MPI_COMPILER-py3 ==================
|
||||
|
|
@ -1017,23 +963,17 @@ echo ============================= install serial ==================
|
|||
%if !%{with context}
|
||||
--without-context --without-coroutine \
|
||||
--without-fiber \
|
||||
%endif
|
||||
%if !%{with python2}
|
||||
--without-python \
|
||||
%endif
|
||||
--prefix=$RPM_BUILD_ROOT%{_prefix} \
|
||||
--libdir=$RPM_BUILD_ROOT%{_libdir} \
|
||||
variant=release threading=multi debug-symbols=on pch=off \
|
||||
%if %{with python2}
|
||||
python=%{python2_version} \
|
||||
%endif
|
||||
install
|
||||
python=%{python2_version} install
|
||||
|
||||
# Override DSO symlink with a linker script. See the linker script
|
||||
# itself for details of why we need to do this.
|
||||
[ -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so ] # Must be present
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so
|
||||
install -p -m 644 $(basename %{SOURCE1}) $RPM_BUILD_ROOT%{_libdir}/
|
||||
install -p -m 644 $(basename %{SOURCE2}) $RPM_BUILD_ROOT%{_libdir}/
|
||||
|
||||
%if %{with python3}
|
||||
echo ============================= install serial-py3 ==================
|
||||
|
|
@ -1230,11 +1170,9 @@ fi
|
|||
%{_libdir}/libboost_math_tr1f.so.%{sonamever}
|
||||
%{_libdir}/libboost_math_tr1l.so.%{sonamever}
|
||||
|
||||
%if %{with python2}
|
||||
%files numpy2
|
||||
%files numpy
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_numpy.so.%{sonamever}
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
%files numpy3
|
||||
|
|
@ -1251,17 +1189,10 @@ fi
|
|||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_program_options.so.%{sonamever}
|
||||
|
||||
%if %{with python2}
|
||||
%files python2
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_python.so.%{sonamever}
|
||||
|
||||
%files python2-devel
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/libboost_numpy.so
|
||||
%{_libdir}/libboost_python.so
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
%files python3
|
||||
%license LICENSE_1_0.txt
|
||||
|
|
@ -1348,9 +1279,11 @@ fi
|
|||
%{_libdir}/libboost_math_c99.so
|
||||
%{_libdir}/libboost_math_c99f.so
|
||||
%{_libdir}/libboost_math_c99l.so
|
||||
%{_libdir}/libboost_numpy.so
|
||||
%{_libdir}/libboost_prg_exec_monitor.so
|
||||
%{_libdir}/libboost_unit_test_framework.so
|
||||
%{_libdir}/libboost_program_options.so
|
||||
%{_libdir}/libboost_python.so
|
||||
%{_libdir}/libboost_random.so
|
||||
%{_libdir}/libboost_regex.so
|
||||
%{_libdir}/libboost_serialization.so
|
||||
|
|
@ -1385,21 +1318,14 @@ fi
|
|||
%files openmpi-devel
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/openmpi/lib/libboost_mpi.so
|
||||
%{_libdir}/openmpi/lib/libboost_mpi_python.so
|
||||
%{_libdir}/openmpi/lib/libboost_graph_parallel.so
|
||||
|
||||
%if %{with python2}
|
||||
|
||||
%files openmpi-python2
|
||||
%files openmpi-python
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/openmpi/lib/libboost_mpi_python.so.%{sonamever}
|
||||
%{python2_sitearch}/openmpi/boost/
|
||||
|
||||
%files openmpi-python2-devel
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/openmpi/lib/libboost_mpi_python.so
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
|
||||
%files openmpi-python3
|
||||
|
|
@ -1429,21 +1355,14 @@ fi
|
|||
%files mpich-devel
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/mpich/lib/libboost_mpi.so
|
||||
%{_libdir}/mpich/lib/libboost_mpi_python.so
|
||||
%{_libdir}/mpich/lib/libboost_graph_parallel.so
|
||||
|
||||
%if %{with python2}
|
||||
|
||||
%files mpich-python2
|
||||
%files mpich-python
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/mpich/lib/libboost_mpi_python.so.%{sonamever}
|
||||
%{python2_sitearch}/mpich/boost/
|
||||
|
||||
%files mpich-python2-devel
|
||||
%license LICENSE_1_0.txt
|
||||
%{_libdir}/mpich/lib/libboost_mpi_python.so
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
|
||||
%files mpich-python3
|
||||
|
|
@ -1478,38 +1397,12 @@ fi
|
|||
%{_mandir}/man1/bjam.1*
|
||||
|
||||
%changelog
|
||||
* Tue Jun 19 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-11
|
||||
- Add patch to fix build with Python 3.7
|
||||
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.66.0-11
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Mon Jun 04 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-10
|
||||
* Tue Jun 05 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-7
|
||||
- Add patch for Boost.Compute (#1585515)
|
||||
|
||||
* Tue May 01 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-9
|
||||
- Fix Provides: and Obsoletes: tags for renamed python2 subpackages
|
||||
- Remove old Provides: and Obsoletes: tags for odeint packages
|
||||
- Remove old Provides: and Obsoletes: tags for mpich2 packages
|
||||
- Remove old Provides: and Obsoletes: tags for boost-devel-static
|
||||
* Fri Apr 27 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-6
|
||||
- Make Requires: for boost-container unconditional
|
||||
|
||||
* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 1.66.0-8
|
||||
- Rebuild for ICU 61.1
|
||||
|
||||
* Fri Apr 27 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-7
|
||||
- Remove Requires: boost-openmpi-python from boost-openmpi-devel
|
||||
|
||||
* Thu Apr 26 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-6
|
||||
- Remove main package dependency on boost-python and boost-numpy (#1569483)
|
||||
- Rename all subpackages using python2 from boost-xxx to boost-xxx2.
|
||||
- Split new subpackage boost-python2-devel out of boost-devel.
|
||||
- Split new subpackage boost-openmpi-python2-devel out of boost-openmpi-devel.
|
||||
- Split new subpackage boost-mpich-python2-devel out of boost-mpich-devel.
|
||||
- Enable conditional build for python2 packages.
|
||||
- Drop ver.py source file and use python2_version and python3_version macros.
|
||||
- Use shell variable for Python 3 ABI flags instead of global macro.
|
||||
|
||||
* Tue Feb 27 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-5
|
||||
- Ensure boost metapackage installs boost-container and boost-stacktrace.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue