boost: stop using #pragma GCC system_header

... it breaks dependency generation.

Change-Id: Ib6e1dac1210020d3a6eb1748f1266e69582f199e

2 files changed, 132 insertions, 45 deletions

diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0
index dd3ce71b910d..c1cfea73b4be 100644
--- a/external/boost/boost.wdeprecated-auto_ptr.patch.0
+++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0
@@ -1,91 +1,144 @@
---- boost/ptr_container/ptr_map.hpp
-+++ boost/ptr_container/ptr_map.hpp
-@@ -16,6 +16,10 @@
- # pragma once
- #endif
- 
-+#if defined __GNUC__
-+#pragma GCC system_header
-+#endif
-+
- #include <map>
- #include <boost/ptr_container/ptr_map_adapter.hpp>
- 
 --- boost/ptr_container/ptr_map_adapter.hpp
 +++ boost/ptr_container/ptr_map_adapter.hpp
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,12 @@
  # pragma once
  #endif
  
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
 +
  #include <boost/ptr_container/detail/map_iterator.hpp>
  #include <boost/ptr_container/detail/associative_ptr_container.hpp>
  #include <boost/ptr_container/detail/meta_functions.hpp>
+@@ -876,4 +876,8 @@
+     
+ } // namespace 'boost'  
+ 
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
 --- boost/ptr_container/ptr_set_adapter.hpp
 +++ boost/ptr_container/ptr_set_adapter.hpp
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,12 @@
  # pragma once
  #endif
  
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
 +
  #include <boost/ptr_container/detail/associative_ptr_container.hpp>
  #include <boost/ptr_container/detail/meta_functions.hpp>
  #include <boost/ptr_container/detail/void_ptr_iterator.hpp>
---- boost/ptr_container/ptr_vector.hpp
-+++ boost/ptr_container/ptr_vector.hpp
-@@ -16,6 +16,10 @@
+@@ -693,4 +693,8 @@
+ 
+ } // namespace 'boost'  
+ 
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
+--- boost/ptr_container/ptr_sequence_adapter.hpp
++++ boost/ptr_container/ptr_sequence_adapter.hpp
+@@ -16,6 +16,11 @@
  # pragma once
  #endif
  
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
-+
- #include <vector>
- #include <boost/ptr_container/ptr_sequence_adapter.hpp>
  
+ #include <boost/ptr_container/detail/reversible_ptr_container.hpp>
+ #include <boost/ptr_container/indirect_fun.hpp>
+@@ -773,4 +777,8 @@
+ 
+ } // namespace 'boost'  
+ 
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif
 --- boost/smart_ptr/detail/shared_count.hpp
 +++ boost/smart_ptr/detail/shared_count.hpp
-@@ -18,6 +18,10 @@
+@@ -18,6 +18,12 @@
  // http://www.boost.org/LICENSE_1_0.txt)
  //
  
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
 +
  #ifdef __BORLANDC__
  # pragma warn -8027     // Functions containing try are not expanded inline
  #endif
+@@ -604,4 +604,8 @@
+ # pragma warn .8027     // Functions containing try are not expanded inline
+ #endif
+ 
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif  // #ifndef BOOST_SMART_PTR_DETAIL_SHARED_COUNT_HPP_INCLUDED
 --- boost/smart_ptr/scoped_ptr.hpp
 +++ boost/smart_ptr/scoped_ptr.hpp
-@@ -11,6 +11,10 @@
+@@ -11,6 +11,12 @@
  //  http://www.boost.org/libs/smart_ptr/scoped_ptr.htm
  //
  
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
 +
  #include <boost/config.hpp>
  #include <boost/assert.hpp>
  #include <boost/checked_delete.hpp>
+@@ -158,4 +158,8 @@
+ 
+ } // namespace boost
+ 
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif // #ifndef BOOST_SMART_PTR_SCOPED_PTR_HPP_INCLUDED
 --- boost/smart_ptr/shared_ptr.hpp
 +++ boost/smart_ptr/shared_ptr.hpp
-@@ -14,6 +14,10 @@
+@@ -14,6 +14,12 @@
  //  See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation.
  //
  
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +#endif
 +
  #include <boost/config.hpp>   // for broken compiler workarounds
  
  #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
+@@ -1036,4 +1036,9 @@
+ 
+ #endif  // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
+ 
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif  // #ifndef BOOST_SMART_PTR_SHARED_PTR_HPP_INCLUDED
diff --git a/external/boost/boost_1_44_0-clang-warnings.patch b/external/boost/boost_1_44_0-clang-warnings.patch
index 0ab163617069..177df0216c6e 100644
--- a/external/boost/boost_1_44_0-clang-warnings.patch
+++ b/external/boost/boost_1_44_0-clang-warnings.patch
@@ -11,40 +11,74 @@
         }
 --- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp
 +++ misc/build/boost_1_44_0/boost/random/lagged_fibonacci.hpp
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,12 @@
  #ifndef BOOST_RANDOM_LAGGED_FIBONACCI_HPP
  #define BOOST_RANDOM_LAGGED_FIBONACCI_HPP
  
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wshadow"
 +#endif
 +
  #include <istream>
  #include <iosfwd>
  #include <algorithm>     // std::max
+@@ -537,4 +537,8 @@
+ 
+ } // namespace boost
+ 
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif // BOOST_RANDOM_LAGGED_FIBONACCI_HPP
 --- misc/boost_1_44_0/boost/random/shuffle_output.hpp
 +++ misc/build/boost_1_44_0/boost/random/shuffle_output.hpp
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,12 @@
  #ifndef BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
  #define BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
  
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wshadow"
 +#endif
 +
  #include <boost/random/shuffle_order.hpp>
  
  namespace boost {
+@@ -52,4 +52,8 @@
+ }
+ }
+ 
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif // BOOST_RANDOM_SHUFFLE_OUTPUT_HPP
 --- misc/boost_1_44_0/boost/random/subtract_with_carry.hpp
 +++ misc/build/boost_1_44_0/boost/random/subtract_with_carry.hpp
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,12 @@
  #ifndef BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
  #define BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
  
-+#if defined __GNUC__
-+#pragma GCC system_header
++#include <config_global.h>
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic push
++# pragma GCC diagnostic ignored "-Wshadow"
 +#endif
 +
  #include <boost/config/no_tr1/cmath.hpp>         // std::pow
  #include <iostream>
  #include <algorithm>     // std::equal
+@@ -614,4 +614,8 @@
+ } // namespace random
+ } // namespace boost
+ 
++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
++# pragma GCC diagnostic pop
++#endif
++
+ #endif // BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP
+