boost/gcc_path.patch

33 lines
1.4 KiB
Diff
Raw Normal View History

Author: Adam Majer <amajer@suse.de>
Date: Mon, 12 Sep 2016 17:12:13 +0200
Summary: Adapt paths for our GCC versions
Bugs: bnc#996917
Boost assumes /usr/include/c++/x.y.z/ existence for GCC 4.x
onward while our version of GCC only has /usr/include/c++/x.y
for 4.x GCC and /usr/include/c++/x/ for 5.x onward.
Accepting request 489639 from home:adamm:branches:devel:libraries:c_c++ - New upstream version 1.64.0 + process - new library providing cross platform methods to - create child processes - setup stream for child processes - sync and async communication streams with children - sync and async wait - process termination + geometry library had some breaking changes, - ublas_transformer is renamed to matrix_transformer - explicit modifier is added to constructors of rtree index::dynamic_* parameters - strategy::area::huiller replaced by strategy::area::spherical + context library updates - deprecated API:execution-context - fixed bad assembly for fcontext on ppc64/sysv/elf + Updated libraries: any, atomic, config, container, context, conversion, core, coroutine2, fiber, hash, interprocess, intrusive, lexicalcast, math, multi-index containers, multiprecision, predef, program options, regex, smart pointers, test ,typeindex, typetraits, unordered, variant + for details, see http://www.boost.org/users/history/version_1_64_0.html - Build PyNumpy module + add build requires on python-numpy - test_lowcase.patch: upstreamed - refreshed patches: boost-strict_aliasing.patch, gcc_path.patch, python_mpi.patch - mpi_upstream.patch: pending upstream fixes to OpenMPI build - python_library_name.patch: we are building python versions in different stagings so drop library renames. OBS-URL: https://build.opensuse.org/request/show/489639 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=194
2017-04-21 14:48:16 +02:00
Index: boost_1_64_0/boost/tr1/detail/config_all.hpp
===================================================================
Accepting request 489639 from home:adamm:branches:devel:libraries:c_c++ - New upstream version 1.64.0 + process - new library providing cross platform methods to - create child processes - setup stream for child processes - sync and async communication streams with children - sync and async wait - process termination + geometry library had some breaking changes, - ublas_transformer is renamed to matrix_transformer - explicit modifier is added to constructors of rtree index::dynamic_* parameters - strategy::area::huiller replaced by strategy::area::spherical + context library updates - deprecated API:execution-context - fixed bad assembly for fcontext on ppc64/sysv/elf + Updated libraries: any, atomic, config, container, context, conversion, core, coroutine2, fiber, hash, interprocess, intrusive, lexicalcast, math, multi-index containers, multiprecision, predef, program options, regex, smart pointers, test ,typeindex, typetraits, unordered, variant + for details, see http://www.boost.org/users/history/version_1_64_0.html - Build PyNumpy module + add build requires on python-numpy - test_lowcase.patch: upstreamed - refreshed patches: boost-strict_aliasing.patch, gcc_path.patch, python_mpi.patch - mpi_upstream.patch: pending upstream fixes to OpenMPI build - python_library_name.patch: we are building python versions in different stagings so drop library renames. OBS-URL: https://build.opensuse.org/request/show/489639 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=194
2017-04-21 14:48:16 +02:00
--- boost_1_64_0.orig/boost/tr1/detail/config_all.hpp
+++ boost_1_64_0/boost/tr1/detail/config_all.hpp
@@ -102,14 +102,12 @@
// compiler version:
# define BOOST_TR1_STD_HEADER(name) <../4.0.0/name>
/*
- * Before version 3.4.0 the 0 patch level was not part of the include path:
+ * SUSE GCC 4.x has 2 level directory and GCC 5.x and 6.x, only __GNUC__
*/
-# elif defined (__GNUC_PATCHLEVEL__) && ((__GNUC_PATCHLEVEL__ > 0) || \
- (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
- (__GNUC__ > 3))
-# define BOOST_TR1_STD_HEADER(name) <../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/name>
-# else
+# elif __GNUC__ < 5
# define BOOST_TR1_STD_HEADER(name) <../__GNUC__.__GNUC_MINOR__/name>
+# else
+# define BOOST_TR1_STD_HEADER(name) <../__GNUC__/name>
# endif
# endif