boost169 update spec file for pel7

Signed-off-by: basebuilder_pel7ppc64lebuilder0 <basebuilder@powerel.org>

SPECS/boost169.spec

@@ -1,3 +1,5 @@
+%global _smp_mflags -j16
+
 # Support for documentation installation As the %%doc macro erases the
 # target directory ($RPM_BUILD_ROOT%%{_docdir}/%%{name}), manually
 # installed documentation must be saved into a temporary dedicated
@@ -13,13 +15,13 @@
 %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
-%if 0%{?rhel} >= 7
-%ifarch ppc64le
-  %bcond_with mpich
-%else
+#%if 0%{?rhel} >= 7
+#%ifarch ppc64le
+#  %bcond_with mpich
+#%else
   %bcond_without mpich
-%endif
-%endif
+#%endif
+#%endif
 %if 0%{?rhel} == 6
 %ifarch %{arm} ppc64
   %bcond_with mpich
@@ -32,7 +34,7 @@
 %endif
 
 %if 0%{?rhel} >= 7
-%ifarch s390 s390x ppc64le
+%ifarch s390 s390x
   # No OpenMPI support on these arches
   %bcond_with openmpi
 %else
@@ -49,7 +51,7 @@
 %bcond_without python2
 %bcond_without python3
 
-%ifnarch %{ix86} x86_64
+%ifnarch %{ix86} x86_64 ppc64le ppc64
   %bcond_with quadmath
 %else
   %bcond_without quadmath
@@ -797,8 +799,8 @@ find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x
 
 %patch4 -p1
 %patch5 -p1
-%patch15 -p0
-%patch25 -p1
+#%patch15 -p0
+#%patch25 -p1
 %patch51 -p1
 %patch61 -p1
 %patch62 -p1
@@ -937,7 +939,7 @@ export PATH=/bin${PATH:+:}$PATH
 
 # Build MPI parts of Boost with MPICH support
 %if %{with mpich}
-%{_mpich_load}
+%{_mpich_3_2_load}
 %if %{with python2}
 echo ============================= build $MPI_COMPILER ==================
 ./b2 -d+2 -q %{?_smp_mflags} \
@@ -955,7 +957,7 @@ echo ============================= build $MPI_COMPILER-py3 ==================
 	python=%{python3_version} stage
 %endif
 
-%{_mpich_unload}
+%{_mpich_3_2_unload}
 export PATH=/bin${PATH:+:}$PATH
 %endif # with mpich
 
@@ -1020,7 +1022,7 @@ export PATH=/bin${PATH:+:}$PATH
 %endif
 
 %if %{with mpich}
-%{_mpich_load}
+%{_mpich_3_2_load}
 %if %{with python2}
 echo ============================= install $MPI_COMPILER ==================
 ./b2 -q %{?_smp_mflags} \
@@ -1055,7 +1057,7 @@ mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/mpi.so \
 # Remove generic parts of boost that were built for dependencies.
 rm -f ${RPM_BUILD_ROOT}${MPI_HOME}/lib/libboost_{python,{w,}serialization}*
 
-%{_mpich_unload}
+%{_mpich_3_2_unload}
 export PATH=/bin${PATH:+:}$PATH
 %endif # with mpich
 
@@ -1206,26 +1208,26 @@ do
 done
 
 %if %{with mpich}
-mv -f $RPM_BUILD_ROOT%{_libdir}/mpich/lib/{*.a,%{name}}
+#mv -f $RPM_BUILD_ROOT%{_libdir}/mpich-3.2/lib/{*.a,%%{name}}
 #mv -f $RPM_BUILD_ROOT%%{python2_sitearch}/mpich/boost/{mpi.so,%%{name}}
-for library in $RPM_BUILD_ROOT%{_libdir}/mpich/lib/*.so
-do
-  rm -f $library
-  ln -s ../$(basename $library).%{sonamever} $RPM_BUILD_ROOT%{_libdir}/mpich/lib/%{name}/$(basename $library)
-done
+#for library in $RPM_BUILD_ROOT%{_libdir}/mpich-3.2/lib/*.so
+#do
+#  rm -f $library
+#  ln -s ../$(basename $library).%{sonamever} $RPM_BUILD_ROOT%{_libdir}/mpich-3.2/lib/%{name}/$(basename $library)
+#done
 %endif # with mpich
 
 %if %{with openmpi}
 	%if 0%{?rhel} == 5
 		mv -f $RPM_BUILD_ROOT%{_libdir}/openmpi/{1.4-gcc/lib/*,lib}
 	%endif
-mv -f $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/{*.a,%{name}}
+#mv -f $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/{*.a,%%{name}}
 #mv -f $RPM_BUILD_ROOT%%{python2_sitearch}/openmpi/boost/{mpi.so,%%{name}}
-for library in $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/*.so
-do
-  rm -f $library
-  ln -s ../$(basename $library).%{sonamever} $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/%{name}/$(basename $library)
-done
+#for library in $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/*.so
+#do
+#  rm -f $library
+#  ln -s ../$(basename $library).%{sonamever} $RPM_BUILD_ROOT%{_libdir}/openmpi/lib/%{name}/$(basename $library)
+#done
 %endif
 
 %clean
@@ -1452,13 +1454,13 @@ fi
 %if %{with python2}
 %files numpy2
 %license LICENSE_1_0.txt
-%{_libdir}/libboost_numpy2*.so.%{sonamever}
+#%{_libdir}/libboost_numpy2*.so.%{sonamever}
 %endif
 
 %if %{with python3}
 %files numpy3
 %license LICENSE_1_0.txt
-%{_libdir}/libboost_numpy3*.so.%{sonamever}
+#%{_libdir}/libboost_numpy3*.so.%{sonamever}
 %endif
 
 %files test
@@ -1569,10 +1571,10 @@ fi
 %license LICENSE_1_0.txt
 %{_libdir}/%{name}/*.a
 %if %{with mpich}
-%{_libdir}/mpich/lib/%{name}/*.a
+#%{_libdir}/mpich-3.2/lib/%{name}/*.a
 %endif # with mpich
 %if %{with openmpi}
-%{_libdir}/openmpi/lib/%{name}/*.a
+#%{_libdir}/openmpi/lib/%{name}/*.a
 %endif
 
 # OpenMPI packages
@@ -1586,7 +1588,7 @@ fi
 %files openmpi-devel
 %defattr(-, root, root, -)
 %license LICENSE_1_0.txt
-%{_libdir}/openmpi/lib/%{name}/libboost_*.so
+#%{_libdir}/openmpi/lib/%{name}/libboost_*.so
 
 %if %{with python2}
 
@@ -1627,23 +1629,23 @@ fi
 %files mpich
 %defattr(-, root, root, -)
 %license LICENSE_1_0.txt
-%{_libdir}/mpich/lib/libboost_mpi*.so.%{sonamever}
+%{_libdir}/mpich-3.2/lib/libboost_mpi*.so.%{sonamever}
 
 %files mpich-devel
 %defattr(-, root, root, -)
 %license LICENSE_1_0.txt
-%{_libdir}/mpich/lib/%{name}/libboost_*.so
+%{_libdir}/mpich-3.2/lib/%{name}/libboost_*.so
 
 %if %{with python2}
 
 %files mpich-python2
 %license LICENSE_1_0.txt
-%{_libdir}/mpich/lib/libboost_mpi_python2*.so.%{sonamever}
+%{_libdir}/mpich-3.2/lib/libboost_mpi_python2*.so.%{sonamever}
 %{python2_sitearch}/mpich/boost/
 
 %files mpich-python2-devel
 %license LICENSE_1_0.txt
-%{_libdir}/mpich/lib/%{name}/libboost_mpi_python2*.so
+%{_libdir}/mpich-3.2/lib/%{name}/libboost_mpi_python2*.so
 
 %endif
 
@@ -1651,19 +1653,19 @@ fi
 
 %files mpich-python3
 %license LICENSE_1_0.txt
-%{_libdir}/mpich/lib/libboost_mpi_python3*.so.%{sonamever}
+%{_libdir}/mpich-3.2/lib/libboost_mpi_python3*.so.%{sonamever}
 %{python3_sitearch}/mpich/boost/
 
 %files mpich-python3-devel
 %license LICENSE_1_0.txt
-%{_libdir}/mpich/lib/%{name}/libboost_mpi_python3*.so
+%{_libdir}/mpich-3.2/lib/%{name}/libboost_mpi_python3*.so
 
 %endif
 
 %files graph-mpich
 %defattr(-, root, root, -)
 %license LICENSE_1_0.txt
-%{_libdir}/mpich/lib/libboost_graph_parallel*.so.%{sonamever}
+%{_libdir}/mpich-3.2/lib/libboost_graph_parallel*.so.%{sonamever}
 
 %endif # with mpich