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

Add RPM_OPT_FLAGS and RPM_LD_FLAGS to build flags for bjam (#1541035)

This commit is contained in:
Jonathan Wakely 2018-02-07 21:57:41 +00:00
parent d50c552e84
commit 47b8c9cad1
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
boost-1.66.0-bjam-build-flags.patch
View File

@ -1,11 +1,26 @@
--- boost_1_66_0/tools/build/src/engine/build.sh~ 2018-02-01 17:16:31.543526531 +0000
+++ boost_1_66_0/tools/build/src/engine/build.sh 2018-02-01 17:16:45.034507965 +0000
@@ -149,7 +149,7 @@
;;
*)
- BOOST_JAM_CC=gcc
+ BOOST_JAM_CC="gcc $RPM_OPT_FLAGS $RPM_LD_FLAGS"
esac
;;
--- boost_1_66_0/tools/build/src/engine/build.jam~ 2018-02-07 21:36:14.552201421 +0000
+++ boost_1_66_0/tools/build/src/engine/build.jam 2018-02-07 21:36:29.014173266 +0000
@@ -4,7 +4,7 @@
#~ http://www.boost.org/LICENSE_1_0.txt)
# Clean env vars of any "extra" empty values.
-for local v in ARGV CC CFLAGS LIBS
+for local v in ARGV CC CFLAGS LIBS RPM_OPT_FLAGS RPM_LD_FLAGS
{
local values ;
for local x in $($(v))
@@ -215,12 +215,12 @@
: -L$(--python-lib[1]) -l$(--python-lib[2]) ;
## GCC 2.x, 3.x, 4.x
toolset gcc gcc : "-o " : -D
- : -pedantic -fno-strict-aliasing
+ : -pedantic -fno-strict-aliasing $(RPM_OPT_FLAGS)
[ opt --release : [ opt --symbols : -g : -s ] -O3 ]
[ opt --debug : -g -O0 -fno-inline ]
[ opt --profile : -O3 -g -pg ]
-I$(--python-include) -I$(--extra-include) -Wno-long-long
- : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+ : -L$(--python-lib[1]) -l$(--python-lib[2]) $(RPM_LD_FLAGS) ;
## GCC 2.x, 3.x on CYGWIN but without cygwin1.dll
toolset gcc-nocygwin gcc : "-o " : -D
: -s -O3 -mno-cygwin

5
boost.spec
View File

@ -35,7 +35,7 @@ Name: boost
Summary: The free peer-reviewed portable C++ source libraries
Version: 1.66.0
%global version_enc 1_66_0
Release: 1%{?dist}
Release: 2%{?dist}
License: Boost and MIT and Python
%global toplev_dirname %{name}_%{version_enc}
@ -1564,6 +1564,9 @@ fi
%{_mandir}/man1/bjam.1*
%changelog
* Wed Feb 07 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-2
- Add RPM_OPT_FLAGS and RPM_LD_FLAGS to build flags for bjam (#1541035).
* Mon Feb 05 2018 Jonathan Wakely <jwakely@redhat.com> - 1.66.0-1
- Add RPM_LD_FLAGS to Jamfile and patch build.sh to use RPM flags (#1541035).