openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File gcc_path.patch of Package boost (Revision 844af5986dc8d6fd5b50a089f1001827)

Currently displaying revision 844af5986dc8d6fd5b50a089f1001827 , Show latest

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_54_0/boost/tr1/detail/config_all.hpp
===================================================================
--- boost_1_54_0.orig/boost/tr1/detail/config_all.hpp
+++ boost_1_54_0/boost/tr1/detail/config_all.hpp
@@ -95,14 +95,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

Places

File gcc_path.patch of Package boost (Revision 844af5986dc8d6fd5b50a089f1001827)

Places