Skip to content

Commit

Permalink
parallel-libs/boost: patch intel-linux toolset to use -std=c++11 (ope…
Browse files Browse the repository at this point in the history
…nhpc#1035)

Signed-off-by: Aaron Blakeman <[email protected]>
  • Loading branch information
amblakem committed Oct 9, 2019
1 parent 70c5bd1 commit aab7160
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- boost_1_71_0/tools/build/src/engine/build.sh~ 2019-10-09 13:19:04.837484245 -0700
+++ boost_1_71_0/tools/build/src/engine/build.sh 2019-10-09 13:19:30.843484245 -0700
@@ -234,7 +234,8 @@
export LD_RUN_PATH
. ${B2_TOOLSET_ROOT}bin/iccvars.sh $ARCH
fi
- B2_CXX="${CXX} -xc++"
+ # https://github.com/boostorg/build/issues/475
+ B2_CXX="${CXX} -xc++ -std=c++11"
B2_CXXFLAGS_RELEASE="-O3 -s"
B2_CXXFLAGS_DEBUG="-O0 -g -p"
;;

10 changes: 10 additions & 0 deletions components/parallel-libs/boost/SPECS/boost.spec
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ Patch1: boost_fenv_suse.patch
%endif
%endif

# intel-linux toolset fix: https://github.com/boostorg/build/issues/475
%if "%{compiler_family}" == "intel"
Patch2: boost-1.71.0-intel-bootstrap.patch
%endif


# optflag patch from Fedora
Patch4: https://src.fedoraproject.org/rpms/boost/raw/master/f/boost-1.66.0-build-optflags.patch

Expand Down Expand Up @@ -94,6 +100,10 @@ see the boost-doc package.
%endif
%endif

%if "%{compiler_family}" == "intel"
%patch2 -p1
%endif

# optflag patches from Fedora
%patch4 -p1

Expand Down

0 comments on commit aab7160

Please sign in to comment.