Accepting request 732128 from devel:libraries:c_c++
OBS-URL: https://build.opensuse.org/request/show/732128 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=130
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
dbc40a98aa
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 19 15:34:53 UTC 2019 - Andreas Schwab <schwab@suse.de>
|
||||
|
||||
- Enable context on riscv64
|
||||
- riscv-support.patch: Add missing bits for riscv support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 18 15:38:24 UTC 2019 - Andreas Schwab <schwab@suse.de>
|
||||
|
||||
- Make sure %{_libdir}/cmake is packaged also without openblas-devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 11 11:47:40 UTC 2019 - Adam Majer <adam.majer@suse.de>
|
||||
|
||||
|
||||
@ -130,7 +130,7 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
|
||||
%bcond_with python_numpy
|
||||
%endif
|
||||
# context hasn't been ported to most architectures yet
|
||||
%ifarch %{ix86} x86_64 %{arm} aarch64 mips ppc ppc64 ppc64le
|
||||
%ifarch %{ix86} x86_64 %{arm} aarch64 mips ppc ppc64 ppc64le riscv64
|
||||
%bcond_without build_context
|
||||
%else
|
||||
%bcond_with build_context
|
||||
@ -197,6 +197,7 @@ Patch17: python_mpi.patch
|
||||
Patch18: dynamic_linking.patch
|
||||
Patch20: python_library_name.patch
|
||||
Patch23: 3ecbf83f.patch
|
||||
Patch24: riscv-support.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libbz2-devel
|
||||
BuildRequires: libexpat-devel
|
||||
@ -1230,6 +1231,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
|
||||
%patch18 -p1
|
||||
%patch20 -p1
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
|
||||
%build
|
||||
find . -type f -exec chmod u+w {} +
|
||||
@ -1928,6 +1930,7 @@ EOF
|
||||
%{package_libdir}/libboost_mpi.so.%{version}
|
||||
|
||||
%files -n libboost_mpi%{library_version}-devel
|
||||
%dir %{package_libdir}/cmake
|
||||
%dir %{package_libdir}/cmake/boost_mpi-%{version}
|
||||
%{package_libdir}/cmake/boost_mpi-%{version}/*
|
||||
%{package_libdir}/libboost_mpi.so
|
||||
@ -1936,6 +1939,7 @@ EOF
|
||||
%{package_libdir}/libboost_graph_parallel.so.%{version}
|
||||
|
||||
%files -n libboost_graph_parallel%{library_version}-devel
|
||||
%dir %{package_libdir}/cmake
|
||||
%dir %{package_libdir}/cmake/boost_graph_parallel-%{version}
|
||||
%{package_libdir}/cmake/boost_graph_parallel-%{version}/*
|
||||
%{package_libdir}/libboost_graph_parallel.so
|
||||
@ -1945,6 +1949,7 @@ EOF
|
||||
%{package_libdir}/libboost_mpi_python-py2_7.so.%{version}
|
||||
|
||||
%files -n libboost_mpi_python-py2_7-%{library_version}-devel
|
||||
%dir %{package_libdir}/cmake
|
||||
%dir %{package_libdir}/cmake/boost_mpi_python-%{version}
|
||||
%{package_libdir}/cmake/boost_mpi_python-%{version}/*
|
||||
%{package_libdir}/libboost_mpi_python-py2_7.so
|
||||
@ -2008,6 +2013,7 @@ EOF
|
||||
%{package_libdir}/libboost_python-py3.so.%{version}
|
||||
|
||||
%files -n libboost_python-py3-%{library_version}-devel
|
||||
%dir %{package_libdir}/cmake
|
||||
%dir %{package_libdir}/cmake/boost_python-%{version}
|
||||
%{package_libdir}/cmake/boost_python-%{version}/*
|
||||
%{package_libdir}/libboost_python3.so
|
||||
@ -2018,6 +2024,7 @@ EOF
|
||||
%{package_libdir}/libboost_numpy-py3.so.%{version}
|
||||
|
||||
%files -n libboost_numpy-py3-%{library_version}-devel
|
||||
%dir %{package_libdir}/cmake
|
||||
%dir %{package_libdir}/cmake/boost_numpy-%{version}
|
||||
%{package_libdir}/cmake/boost_numpy-%{version}/*
|
||||
%{package_libdir}/libboost_numpy-py3.so
|
||||
|
||||
88
riscv-support.patch
Normal file
88
riscv-support.patch
Normal file
@ -0,0 +1,88 @@
|
||||
https://github.com/boostorg/boost/commit/5c8898af4
|
||||
https://github.com/boostorg/predef/commit/fc99bc2
|
||||
|
||||
Index: boost_1_71_0/boost/predef/architecture.h
|
||||
===================================================================
|
||||
--- boost_1_71_0.orig/boost/predef/architecture.h
|
||||
+++ boost_1_71_0/boost/predef/architecture.h
|
||||
@@ -21,6 +21,7 @@ http://www.boost.org/LICENSE_1_0.txt)
|
||||
#include <boost/predef/architecture/ppc.h>
|
||||
#include <boost/predef/architecture/ptx.h>
|
||||
#include <boost/predef/architecture/pyramid.h>
|
||||
+#include <boost/predef/architecture/riscv.h>
|
||||
#include <boost/predef/architecture/rs6k.h>
|
||||
#include <boost/predef/architecture/sparc.h>
|
||||
#include <boost/predef/architecture/superh.h>
|
||||
Index: boost_1_71_0/boost/predef/architecture/riscv.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ boost_1_71_0/boost/predef/architecture/riscv.h
|
||||
@@ -0,0 +1,41 @@
|
||||
+/*
|
||||
+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)
|
||||
+*/
|
||||
+
|
||||
+#ifndef BOOST_PREDEF_ARCHITECTURE_RISCV_H
|
||||
+#define BOOST_PREDEF_ARCHITECTURE_RISCV_H
|
||||
+
|
||||
+#include <boost/predef/version_number.h>
|
||||
+#include <boost/predef/make.h>
|
||||
+
|
||||
+/*`
|
||||
+[heading `BOOST_ARCH_RISCV`]
|
||||
+
|
||||
+[@http://en.wikipedia.org/wiki/RISC-V] architecture.
|
||||
+
|
||||
+[table
|
||||
+ [[__predef_symbol__] [__predef_version__]]
|
||||
+
|
||||
+ [[`__riscv`] [__predef_detection__]]
|
||||
+ ]
|
||||
+ */
|
||||
+
|
||||
+#define BOOST_ARCH_RISCV BOOST_VERSION_NUMBER_NOT_AVAILABLE
|
||||
+
|
||||
+#if defined(__riscv)
|
||||
+# undef BOOST_ARCH_RISCV
|
||||
+# define BOOST_ARCH_RISCV BOOST_VERSION_NUMBER_AVAILABLE
|
||||
+#endif
|
||||
+
|
||||
+#if BOOST_ARCH_RISCV
|
||||
+# define BOOST_ARCH_RISCV_AVAILABLE
|
||||
+#endif
|
||||
+
|
||||
+#define BOOST_ARCH_RISCV_NAME "RISC-V"
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+#include <boost/predef/detail/test.h>
|
||||
+BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_RISCV,BOOST_ARCH_RISCV_NAME)
|
||||
Index: boost_1_71_0/boostcpp.jam
|
||||
===================================================================
|
||||
--- boost_1_71_0.orig/boostcpp.jam
|
||||
+++ boost_1_71_0/boostcpp.jam
|
||||
@@ -607,7 +607,7 @@ rule address-model ( )
|
||||
return <conditional>@boostcpp.deduce-address-model ;
|
||||
}
|
||||
|
||||
-local deducable-architectures = arm mips1 power sparc x86 combined ;
|
||||
+local deducable-architectures = arm mips1 power riscv sparc x86 combined ;
|
||||
feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ;
|
||||
for a in $(deducable-architectures)
|
||||
{
|
||||
@@ -618,11 +618,12 @@ rule deduce-architecture ( properties *
|
||||
{
|
||||
local result ;
|
||||
local filtered = [ toolset-properties $(properties) ] ;
|
||||
- local names = arm mips1 power sparc x86 combined ;
|
||||
+ local names = arm mips1 power riscv sparc x86 combined ;
|
||||
local idx = [ configure.find-builds "default architecture" : $(filtered)
|
||||
: /boost/architecture//arm
|
||||
: /boost/architecture//mips1
|
||||
: /boost/architecture//power
|
||||
+ : /boost/architecture//riscv
|
||||
: /boost/architecture//sparc
|
||||
: /boost/architecture//x86
|
||||
: /boost/architecture//combined ] ;
|
||||
Loading…
Reference in New Issue
Block a user