Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11037825
D12171.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
13 KB
Referenced Files
None
Subscribers
None
D12171.diff
View Options
diff --git a/abi_libs b/abi_libs
--- a/abi_libs
+++ b/abi_libs
@@ -17,7 +17,6 @@
libboost_math_tr1.so.1.72.0
libboost_math_tr1f.so.1.72.0
libboost_math_tr1l.so.1.72.0
-libboost_numpy27.so.1.72.0
libboost_numpy39.so.1.72.0
libboost_prg_exec_monitor.so.1.72.0
libboost_program_options.so.1.72.0
diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -1339,58 +1339,6 @@
libboost_math_tr1l.so.1.72.0:boost_sph_bessell
libboost_math_tr1l.so.1.72.0:boost_sph_legendrel
libboost_math_tr1l.so.1.72.0:boost_sph_neumannl
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy10equivalentERKNS1_5dtypeES4_
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy10initializeEb
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy10multi_iter4nextEv
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy11from_objectERKNS0_3api6objectERKNS1_5dtypeEiiNS1_7ndarray7bitflagE
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy11from_objectERKNS0_3api6objectEiiNS1_7ndarray7bitflagE
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy15make_multi_iterERKNS0_3api6objectE
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy15make_multi_iterERKNS0_3api6objectES5_
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy15make_multi_iterERKNS0_3api6objectES5_S5_
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy5arrayERKNS0_3api6objectE
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy5arrayERKNS0_3api6objectERKNS1_5dtypeE
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy5dtype26register_scalar_convertersEv
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy5dtype7convertERKNS0_3api6objectEb
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy5emptyERKNS0_5tupleERKNS1_5dtypeE
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy5emptyEiPKlRKNS1_5dtypeE
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy5void_C1El
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy5void_C2El
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy5zerosERKNS0_5tupleERKNS1_5dtypeE
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy5zerosEiPKlRKNS1_5dtypeE
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy6detail13builtin_dtypeIbLb1EE3getEv
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy6detail14from_data_implEPvRKNS1_5dtypeERKNS0_3api6objectESA_SA_b
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy6detail14from_data_implEPvRKNS1_5dtypeERKSt6vectorIlSaIlEESB_RKNS0_3api6objectEb
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy6matrix9constructERKNS0_3api6objectERKNS1_5dtypeEb
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy6matrix9constructERKNS0_3api6objectEb
-libboost_numpy27.so.1.72.0:_ZN5boost6python5numpy7ndarray8set_baseERKNS0_3api6objectE
-libboost_numpy27.so.1.72.0:_ZN5boost6python9converter21object_manager_traitsINS0_5numpy10multi_iterEE10get_pytypeEv
-libboost_numpy27.so.1.72.0:_ZN5boost6python9converter21object_manager_traitsINS0_5numpy5dtypeEE10get_pytypeEv
-libboost_numpy27.so.1.72.0:_ZN5boost6python9converter21object_manager_traitsINS0_5numpy5void_EE10get_pytypeEv
-libboost_numpy27.so.1.72.0:_ZN5boost6python9converter21object_manager_traitsINS0_5numpy6matrixEE10get_pytypeEv
-libboost_numpy27.so.1.72.0:_ZN5boost6python9converter21object_manager_traitsINS0_5numpy7ndarrayEE10get_pytypeEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy10multi_iter5shapeEi
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy10multi_iter6get_ndEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy10multi_iter8get_dataEi
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy10multi_iter8not_doneEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy10multi_iter9get_shapeEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy5dtype12get_itemsizeEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy5void_4copyEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy5void_4viewERKNS1_5dtypeE
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy6matrix4copyEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy6matrix4viewERKNS1_5dtypeE
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy6matrix9transposeEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray4copyEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray4viewERKNS1_5dtypeE
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray5shapeEi
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray6astypeERKNS1_5dtypeE
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray7reshapeERKNS0_5tupleE
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray7squeezeEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray7stridesEi
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray8get_baseEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray9get_dtypeEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray9get_flagsEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray9scalarizeEv
-libboost_numpy27.so.1.72.0:_ZNK5boost6python5numpy7ndarray9transposeEv
libboost_numpy39.so.1.72.0:_ZN5boost6python5numpy10equivalentERKNS1_5dtypeES4_
libboost_numpy39.so.1.72.0:_ZN5boost6python5numpy10initializeEb
libboost_numpy39.so.1.72.0:_ZN5boost6python5numpy10multi_iter4nextEv
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -7,8 +7,6 @@
UNKNOWN:PyCFunction_NewEx
UNKNOWN:PyCFunction_Type
UNKNOWN:PyCMethod_New
-UNKNOWN:PyCObject_AsVoidPtr
-UNKNOWN:PyCObject_Type
UNKNOWN:PyCallable_Check
UNKNOWN:PyCapsule_GetPointer
UNKNOWN:PyCapsule_Type
@@ -219,6 +217,7 @@
libc.so.6:__cxa_atexit
libc.so.6:__environ
libc.so.6:__isoc99_sscanf
+libc.so.6:__libc_single_threaded
libc.so.6:__sigsetjmp
libc.so.6:__stack_chk_fail
libc.so.6:_exit
@@ -799,7 +798,7 @@
libstdc++.so.6:_ZNSt14overflow_errorC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
libstdc++.so.6:_ZNSt14overflow_errorD1Ev
libstdc++.so.6:_ZNSt14overflow_errorD2Ev
-libstdc++.so.6:_ZNSt15__exception_ptr13exception_ptrD1Ev
+libstdc++.so.6:_ZNSt15__exception_ptr13exception_ptr10_M_releaseEv
libstdc++.so.6:_ZNSt15basic_streambufIcSt11char_traitsIcEE4syncEv
libstdc++.so.6:_ZNSt15basic_streambufIcSt11char_traitsIcEE5imbueERKSt6locale
libstdc++.so.6:_ZNSt15basic_streambufIcSt11char_traitsIcEE5uflowEv
@@ -882,8 +881,6 @@
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_createERmm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_mutateEmmPKcm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9push_backEc
-libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC1EPKcRKS3_
-libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC1ERKS4_mm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED1Ev
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE10_M_replaceEmmPKwm
@@ -987,6 +984,7 @@
libstdc++.so.6:_ZSt20__throw_system_errori
libstdc++.so.6:_ZSt24__throw_out_of_range_fmtPKcz
libstdc++.so.6:_ZSt28_Rb_tree_rebalance_for_erasePSt18_Rb_tree_node_baseRS_
+libstdc++.so.6:_ZSt28__throw_bad_array_new_lengthv
libstdc++.so.6:_ZSt29_Rb_tree_insert_and_rebalancebPSt18_Rb_tree_node_baseS0_RS_
libstdc++.so.6:_ZSt4cerr
libstdc++.so.6:_ZSt4clog
@@ -1173,14 +1171,12 @@
libstdc++.so.6:__cxa_bad_cast
libstdc++.so.6:__cxa_bad_typeid
libstdc++.so.6:__cxa_begin_catch
-libstdc++.so.6:__cxa_call_unexpected
libstdc++.so.6:__cxa_demangle
libstdc++.so.6:__cxa_end_catch
libstdc++.so.6:__cxa_free_exception
libstdc++.so.6:__cxa_guard_abort
libstdc++.so.6:__cxa_guard_acquire
libstdc++.so.6:__cxa_guard_release
-libstdc++.so.6:__cxa_pure_virtual
libstdc++.so.6:__cxa_rethrow
libstdc++.so.6:__cxa_thread_atexit
libstdc++.so.6:__cxa_throw
diff --git a/files/0002-revert-asymetric-coroutine.patch b/files/0002-revert-asymetric-coroutine.patch
new file mode 100644
--- /dev/null
+++ b/files/0002-revert-asymetric-coroutine.patch
@@ -0,0 +1,49 @@
+From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001
+From: Oliver Kowalke <oliver.kowalke@gmail.com>
+Date: Sun, 1 Dec 2019 20:40:28 +0100
+Subject: [PATCH] Revert "Cease dependence on Range"
+
+This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db.
+
+see #44 (One test fails to compile after boostorg/coroutine submodule updated)
+---
+ boost/coroutine/asymmetric_coroutine.hpp | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp
+index ea96981..640896f 100644
+--- a/boost/coroutine/asymmetric_coroutine.hpp
++++ b/boost/coroutine/asymmetric_coroutine.hpp
+@@ -14,6 +14,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/config.hpp>
+ #include <boost/move/move.hpp>
++#include <boost/range.hpp>
+ #include <boost/throw_exception.hpp>
+ #include <boost/utility/explicit_operator_bool.hpp>
+
+@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c)
+
+ }
+
+-// forward declaration of Boost.Range traits to break dependency on it
+-template<typename C, typename Enabler>
+-struct range_mutable_iterator;
+-
+-template<typename C, typename Enabler>
+-struct range_const_iterator;
+-
+ template< typename Arg >
+-struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void >
++struct range_mutable_iterator< coroutines::push_coroutine< Arg > >
+ { typedef typename coroutines::push_coroutine< Arg >::iterator type; };
+
+ template< typename R >
+-struct range_mutable_iterator< coroutines::pull_coroutine< R >, void >
++struct range_mutable_iterator< coroutines::pull_coroutine< R > >
+ { typedef typename coroutines::pull_coroutine< R >::iterator type; };
+
+ }
+--
+2.24.1
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : libboost
version : 1.72.0
-release : 26
+release : 27
source :
- https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.gz/download : c66e88d5786f2ca4dbebb14e06b566fb642a1a6947ad8cc9091f9f445134143f
homepage : https://www.boost.org/
@@ -15,6 +15,8 @@
- pkgconfig(python3)
- bzip2-devel
- numpy
+setup : |
+ %patch -p1 < $pkgfiles/0002-revert-asymetric-coroutine.patch
build : |
# This installs everything but python 3
./bootstrap.sh --prefix=$installdir/usr \
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
<Name>libboost</Name>
<Homepage>https://www.boost.org/</Homepage>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@getsol.us</Email>
+ <Name>Solène Rapenne</Name>
+ <Email>solene@perso.pw</Email>
</Packager>
<License>BSL-1.0</License>
<PartOf>programming.library</PartOf>
@@ -80,9 +80,6 @@
<Path fileType="library">/usr/lib64/libboost_math_tr1l.so.1</Path>
<Path fileType="library">/usr/lib64/libboost_math_tr1l.so.1.72</Path>
<Path fileType="library">/usr/lib64/libboost_math_tr1l.so.1.72.0</Path>
- <Path fileType="library">/usr/lib64/libboost_numpy27.so.1</Path>
- <Path fileType="library">/usr/lib64/libboost_numpy27.so.1.72</Path>
- <Path fileType="library">/usr/lib64/libboost_numpy27.so.1.72.0</Path>
<Path fileType="library">/usr/lib64/libboost_numpy39.so.1</Path>
<Path fileType="library">/usr/lib64/libboost_numpy39.so.1.72</Path>
<Path fileType="library">/usr/lib64/libboost_numpy39.so.1.72.0</Path>
@@ -146,7 +143,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="26">libboost</Dependency>
+ <Dependency release="27">libboost</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/boost/accumulators/accumulators.hpp</Path>
@@ -14348,9 +14345,7 @@
<Path fileType="library">/usr/lib64/cmake/boost_mpi-1.72.0/boost_mpi-config.cmake</Path>
<Path fileType="library">/usr/lib64/cmake/boost_numpy-1.72.0/boost_numpy-config-version.cmake</Path>
<Path fileType="library">/usr/lib64/cmake/boost_numpy-1.72.0/boost_numpy-config.cmake</Path>
- <Path fileType="library">/usr/lib64/cmake/boost_numpy-1.72.0/libboost_numpy-variant-shared-py2.7.cmake</Path>
<Path fileType="library">/usr/lib64/cmake/boost_numpy-1.72.0/libboost_numpy-variant-shared-py3.9.cmake</Path>
- <Path fileType="library">/usr/lib64/cmake/boost_numpy-1.72.0/libboost_numpy-variant-static-py2.7.cmake</Path>
<Path fileType="library">/usr/lib64/cmake/boost_numpy-1.72.0/libboost_numpy-variant-static-py3.9.cmake</Path>
<Path fileType="library">/usr/lib64/cmake/boost_prg_exec_monitor-1.72.0/boost_prg_exec_monitor-config-version.cmake</Path>
<Path fileType="library">/usr/lib64/cmake/boost_prg_exec_monitor-1.72.0/boost_prg_exec_monitor-config.cmake</Path>
@@ -14469,8 +14464,6 @@
<Path fileType="library">/usr/lib64/libboost_math_tr1f.so</Path>
<Path fileType="library">/usr/lib64/libboost_math_tr1l.a</Path>
<Path fileType="library">/usr/lib64/libboost_math_tr1l.so</Path>
- <Path fileType="library">/usr/lib64/libboost_numpy27.a</Path>
- <Path fileType="library">/usr/lib64/libboost_numpy27.so</Path>
<Path fileType="library">/usr/lib64/libboost_numpy39.a</Path>
<Path fileType="library">/usr/lib64/libboost_numpy39.so</Path>
<Path fileType="library">/usr/lib64/libboost_prg_exec_monitor.a</Path>
@@ -14511,12 +14504,12 @@
</Files>
</Package>
<History>
- <Update release="26">
- <Date>2021-08-11</Date>
+ <Update release="27">
+ <Date>2021-11-02</Date>
<Version>1.72.0</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@getsol.us</Email>
+ <Name>Solène Rapenne</Name>
+ <Email>solene@perso.pw</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Aug 10, 9:18 PM (1 d, 4 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5801746
Default Alt Text
D12171.diff (13 KB)
Attached To
Mode
D12171: Include a patch fixing a known issue
Attached
Detach File
Event Timeline
Log In to Comment