boost/gcc_path.patch
Philipp Thomas fd1ad15b68 Accepting request 431312 from home:adamm:branches:devel:libraries:c_c++
If accepting, don't forward to factory. Some more changes pending.
Plus we can see what breaks in the devel project first.

- update to version 1.62.0
  * new library: fiber: framework for userland-threads/fibers
  * new library: QVM: library for working with quaternions,
        vectors and matrices of static size
  * see http://www.boost.org/users/history/version_1_62_0.html
    for complete changelog
- remove boost-fix_include_config.patch - upstreamed
- gcc_path.patch - fix GCC search paths (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.
- migrate to using %bcond_ instead of hardcoding macros
  for different Boost features
- better way to limit max number of compilation units than
  by reading /proc/meminfo and guesstimating.

OBS-URL: https://build.opensuse.org/request/show/431312
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=175
2016-09-30 09:33:49 +00:00

33 lines
1.4 KiB
Diff

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.
Index: boost_1_62_0/boost/tr1/detail/config_all.hpp
===================================================================
--- boost_1_62_0.orig/boost/tr1/detail/config_all.hpp
+++ boost_1_62_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