rpms
/
boost
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spec: Don't hardcode gcc 

Use %set_build_flags to get the proper values for $CFLAGS, $CC, etc. and
%{toolchain} to get the toolchain identifier
This commit is contained in:
Timm Bäder 2020-12-02 16:12:37 +01:00
parent 8158d2d41c
commit 64d97f19ff
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
boost.spec
View File

@ -695,6 +695,7 @@ find ./boost -name '*.hpp' -perm /111 | xargs chmod a-x
%patch94 -p1
%build
%set_build_flags
# Dump the versions being used into the build logs.
%if %{with python3}
PYTHON3_ABIFLAGS=$(/usr/bin/python3-config --abiflags)
@ -713,7 +714,7 @@ import os ;
local RPM_OPT_FLAGS = [ os.environ RPM_OPT_FLAGS ] ;
local RPM_LD_FLAGS = [ os.environ RPM_LD_FLAGS ] ;
using gcc : : : <compileflags>$(RPM_OPT_FLAGS) <linkflags>$(RPM_LD_FLAGS) ;
using %{toolchain} : : : <compileflags>$(RPM_OPT_FLAGS) <linkflags>$(RPM_LD_FLAGS) ;
%if %{with openmpi} || %{with mpich}
using mpi ;
%endif
@ -725,7 +726,7 @@ using python : %{python3_version} : /usr/bin/python3 : /usr/include/python%{pyth
EOF
%endif
./bootstrap.sh --with-toolset=gcc --with-icu
./bootstrap.sh --with-toolset=%{toolchain} --with-icu
# N.B. When we build the following with PCH, parts of boost (math
# library in particular) end up being built second time during
@ -797,7 +798,7 @@ export PATH=/bin${PATH:+:}$PATH
echo ============================= build Boost.Build ==================
(cd tools/build
./bootstrap.sh --with-toolset=gcc)
./bootstrap.sh --with-toolset=%{toolchain})
%check
: