From 55733c33f6bb8e8e10353a7f9e4ab9c9081b69d0 Mon Sep 17 00:00:00 2001
From: sdlzx <hdu_sdlzx@163.com>
Date: Tue, 6 Apr 2021 17:28:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?update=20boost.spec.=20=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=AF=B9b2=E7=9A=84=E5=A4=9A=E6=AC=A1=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 boost.spec | 52 ++--------------------------------------------------
 1 file changed, 2 insertions(+), 50 deletions(-)

diff --git a/boost.spec b/boost.spec
index dc9b0b7..924cbe0 100644
--- a/boost.spec
+++ b/boost.spec
@@ -628,11 +628,9 @@ using python : %{python3_version} : /usr/bin/python3 : /usr/include/python%{pyth
 EOF
 %endif
 
-./bootstrap.sh --with-toolset=gcc --with-icu
-
-echo ============================= build serial ==================
+./bootstrap.sh
 ./b2 -d+2 -q %{?_smp_mflags} \
-  --without-mpi --without-graph_parallel --build-dir=serial \
+ --build-dir=serial \
 %if !%{with context}
     --without-context --without-coroutine \
     --without-fiber \
@@ -643,52 +641,6 @@ echo ============================= build serial ==================
 %endif
   stage
 
-if [ $(find serial -type f -name has_atomic_flag_lockfree -print -quit | wc -l) -ne 0 ]; then
-  DEF=D
-else
-  DEF=U
-fi
-
-m4 -${DEF}HAS_ATOMIC_FLAG_LOCKFREE -DVERSION=%{version} %{SOURCE1} > $(basename %{SOURCE1})
-
-%if %{with openmpi} || %{with mpich}
-module purge ||:
-%endif
-
-%if %{with openmpi}
-%{_openmpi_load}
-
-%if %{with python3}
-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=%{python3_version} stage
-%endif
-
-%{_openmpi_unload}
-export PATH=/bin${PATH:+:}$PATH
-%endif
-
-%if %{with mpich}
-%{_mpich_load}
-
-%if %{with python3}
-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=%{python3_version} stage
-%endif
-
-%{_mpich_unload}
-export PATH=/bin${PATH:+:}$PATH
-%endif
-
-echo ============================= build Boost.Build ==================
-(cd tools/build
- ./bootstrap.sh --with-toolset=gcc)
-
 %check
 :
 
-- 
Gitee


From 9d4a9b17b2613c4ef0ff2326e987d906f326bac1 Mon Sep 17 00:00:00 2001
From: sdlzx <hdu_sdlzx@163.com>
Date: Tue, 6 Apr 2021 20:24:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?update=20boost.spec.=20=E5=88=A0=E8=BF=87?=
 =?UTF-8?q?=E5=A4=B4=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 boost.spec | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/boost.spec b/boost.spec
index 924cbe0..7eb1ca4 100644
--- a/boost.spec
+++ b/boost.spec
@@ -641,6 +641,14 @@ EOF
 %endif
   stage
 
+if [ $(find serial -type f -name has_atomic_flag_lockfree -print -quit | wc -l) -ne 0 ]; then
+  DEF=D
+else
+  DEF=U
+fi
+
+m4 -${DEF}HAS_ATOMIC_FLAG_LOCKFREE -DVERSION=%{version} %{SOURCE1} > $(basename %{SOURCE1})
+
 %check
 :
 
-- 
Gitee


From a26ed54ebfd328f6d3ec9c895cd34c85ead7a14d Mon Sep 17 00:00:00 2001
From: sdlzx <hdu_sdlzx@163.com>
Date: Fri, 9 Apr 2021 22:43:57 +0800
Subject: [PATCH 3/3] update boost.spec.

---
 boost.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/boost.spec b/boost.spec
index 7eb1ca4..280e95a 100644
--- a/boost.spec
+++ b/boost.spec
@@ -734,17 +734,15 @@ rm -r $RPM_BUILD_ROOT/%{_libdir}/cmake
 version=%{version}
 
 echo ============================= install Boost.Build ==================
-(cd tools/build
- ./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install
+(./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install
  chmod +x $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxproc.py
  sed -i '1s@^#!/usr/bin.python$@&3@' $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxproc.py
  rm $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxygen/windows-paths-check.hpp
  rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/src/tools/doxygen/windows-paths-check.hpp
  rm -f $RPM_BUILD_ROOT%{_bindir}/b2
 
- install -m 755 %{_builddir}/%{name}_%{version_enc}/tools/build/b2 $RPM_BUILD_ROOT%{_bindir}/bjam
+ install -m 755 %{_builddir}/%{name}_%{version_enc}/b2 $RPM_BUILD_ROOT%{_bindir}/bjam
  %{__install} -p -m 644 %{SOURCE2} -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1
- cp %{_libdir}/libboost_*.so.%{old_so_version}.* $RPM_BUILD_ROOT%{_libdir}
 )
 
 echo ============================= install Boost.QuickBook ==================
-- 
Gitee