Rename VERSION variable to avoid clashing with autotools macro (#1478329)
This commit is contained in:
parent
6d2d8199e5
commit
7f11a73455
|
@ -0,0 +1,33 @@
|
||||||
|
--- boost_1_63_0/boost/test/impl/unit_test_parameters.ipp.orig 2017-08-09 18:45:45.223055629 +0100
|
||||||
|
+++ boost_1_63_0/boost/test/impl/unit_test_parameters.ipp 2017-08-09 18:45:48.815050508 +0100
|
||||||
|
@@ -99,7 +99,7 @@
|
||||||
|
|
||||||
|
std::string HELP = "help";
|
||||||
|
std::string USAGE = "usage";
|
||||||
|
-std::string VERSION = "version";
|
||||||
|
+std::string btrt_VERSION = "version";
|
||||||
|
|
||||||
|
//____________________________________________________________________________//
|
||||||
|
|
||||||
|
@@ -638,10 +638,10 @@
|
||||||
|
|
||||||
|
///////////////////////////////////////////////
|
||||||
|
|
||||||
|
- rt::option version( VERSION, (
|
||||||
|
+ rt::option version( btrt_VERSION, (
|
||||||
|
rt::description = "Prints Boost.Test version and exits."
|
||||||
|
));
|
||||||
|
- version.add_cla_id( "--", VERSION, " " );
|
||||||
|
+ version.add_cla_id( "--", btrt_VERSION, " " );
|
||||||
|
store.add( version );
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -676,7 +676,7 @@
|
||||||
|
rt::finalize_arguments( s_parameters_store, s_arguments_store );
|
||||||
|
|
||||||
|
// Report help if requested
|
||||||
|
- if( runtime_config::get<bool>( VERSION ) ) {
|
||||||
|
+ if( runtime_config::get<bool>( btrt_VERSION ) ) {
|
||||||
|
parser->version( std::cerr );
|
||||||
|
BOOST_TEST_I_THROW( framework::nothing_to_test( boost::exit_success ) );
|
||||||
|
}
|
|
@ -35,7 +35,7 @@ Name: boost
|
||||||
Summary: The free peer-reviewed portable C++ source libraries
|
Summary: The free peer-reviewed portable C++ source libraries
|
||||||
Version: 1.63.0
|
Version: 1.63.0
|
||||||
%global version_enc 1_63_0
|
%global version_enc 1_63_0
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
License: Boost and MIT and Python
|
License: Boost and MIT and Python
|
||||||
|
|
||||||
%global toplev_dirname %{name}_%{version_enc}
|
%global toplev_dirname %{name}_%{version_enc}
|
||||||
|
@ -130,6 +130,8 @@ Patch82: boost-1.60.0-no-rpath.patch
|
||||||
# https://github.com/boostorg/build/issues/163
|
# https://github.com/boostorg/build/issues/163
|
||||||
Patch83: boost-1.63.0-dual-python-build.patch
|
Patch83: boost-1.63.0-dual-python-build.patch
|
||||||
|
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1478329
|
||||||
|
Patch84: boost-1.63.0-VERSION-parameter.patch
|
||||||
|
|
||||||
%bcond_with tests
|
%bcond_with tests
|
||||||
%bcond_with docs_generated
|
%bcond_with docs_generated
|
||||||
|
@ -651,6 +653,7 @@ a number of significant features and is now developed independently
|
||||||
%patch68 -p1
|
%patch68 -p1
|
||||||
%patch82 -p0
|
%patch82 -p0
|
||||||
%patch83 -p1
|
%patch83 -p1
|
||||||
|
%patch84 -p1
|
||||||
|
|
||||||
# At least python2_version needs to be a macro so that it's visible in
|
# At least python2_version needs to be a macro so that it's visible in
|
||||||
# %%install as well.
|
# %%install as well.
|
||||||
|
@ -1296,6 +1299,9 @@ fi
|
||||||
%{_mandir}/man1/bjam.1*
|
%{_mandir}/man1/bjam.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 09 2017 Jonathan Wakely <jwakely@redhat.com> - 1.63.0-6
|
||||||
|
- Rename VERSION variable to avoid clashing with autotools macro (#1478329)
|
||||||
|
|
||||||
* Sun Mar 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 1.63.0-5
|
* Sun Mar 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 1.63.0-5
|
||||||
- Enable OpenMPI/mpich on ppc64le and s390x now they have support
|
- Enable OpenMPI/mpich on ppc64le and s390x now they have support
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue