Remove boost.thread linking script which is fixed in upstream PR266

This commit is contained in:
sdlzx 2021-09-26 22:41:52 +08:00
parent 8238f0a4e9
commit 27c6502f39
2 changed files with 8 additions and 30 deletions

View File

@ -18,13 +18,12 @@
Name: boost
Version: 1.77.0
Release: 2
Release: 3
Summary: The free peer-reviewed portable C++ source libraries
License: Boost Software License 1.0
URL: http://www.boost.org
Source0: https://boostorg.jfrog.io/ui/native/main/release/1.77.0/source/%{name}_%{version_enc}.tar.gz
Source1: libboost_thread.so
Source2: bjam
Source1: bjam
# https://bugzilla.redhat.com/show_bug.cgi?id=828856
# https://bugzilla.redhat.com/show_bug.cgi?id=828857
@ -66,8 +65,8 @@ Requires: %{name}-type_erasure%{?_isa} = %{version}-%{release}
Requires: %{name}-wave%{?_isa} = %{version}-%{release}
Requires: %{name}-contract%{?_isa} = %{version}-%{release}
BuildRequires: gcc-c++ m4
BuildRequires: libstdc++-devel bzip2-devel zlib-devel libicu-devel
BuildRequires: gcc-c++
BuildRequires: bzip2-devel zlib-devel libicu-devel
%if %{with python3}
BuildRequires: python3-devel python3-numpy
%endif
@ -629,8 +628,6 @@ else
DEF=U
fi
m4 -${DEF}HAS_ATOMIC_FLAG_LOCKFREE -DVERSION=%{version} %{SOURCE1} > $(basename %{SOURCE1})
%if %{with openmpi} || %{with mpich}
module purge ||:
%endif
@ -745,7 +742,6 @@ echo ============================= install serial ==================
[ -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so ]
rm -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread.so
install -p -m 644 $(basename %{SOURCE1}) $RPM_BUILD_ROOT%{_libdir}/
rm -r $RPM_BUILD_ROOT/%{_libdir}/cmake
@ -761,7 +757,7 @@ echo ============================= install Boost.Build ==================
rm -f $RPM_BUILD_ROOT%{_bindir}/b2
install -m 755 %{_builddir}/%{name}_%{version_enc}/tools/build/b2 $RPM_BUILD_ROOT%{_bindir}/bjam
%{__install} -p -m 644 %{SOURCE2} -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1
%{__install} -p -m 644 %{SOURCE1} -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1
)
echo ============================= install Boost.QuickBook ==================
@ -1079,6 +1075,9 @@ fi
%{_mandir}/man1/bjam.1*
%changelog
* Sun Sep 26 2021 Liu Zixian <liuzixian4@huawei.com> - 1.77.0-3
- Remove linking script which is fixed in upstream PR266
* Wed Sep 22 2021 Liu Zixian <liuzixian4@huawei.com> - 1.77.0-2
- Correct license name for ci.

View File

@ -1,21 +0,0 @@
changequote(`[', `]')dnl
/* GNU ld script
Boost.Thread header files pull in enough of Boost.System that
symbols from the latter library are referenced by a compiled object
that includes Boost.Thread headers. libboost_system-mt.so is among
libboost_thread-mt.so's DT_NEEDED, but program linker requires that
missing symbols are satisfied by direct dependency, not by a
transitive one. Hence this linker script, which brings in the
Boost.System DSO. */
INPUT(libboost_thread.so.VERSION)
INPUT(libboost_system.so.VERSION)
ifdef([HAS_ATOMIC_FLAG_LOCKFREE],[],
[
/* If the given architecture doesn't have lock-free implementation of
boost::atomic_flag, the dependency on Boost.Atomic may leak from
the header files to client binaries. */
INPUT(libboost_atomic.so.VERSION)
])dnl