Commits

Cody Schafer committed faf124b

fold some things up.

  • Participants
  • Parent commits 0700434

Comments (0)

Files changed (6)

+# HG changeset patch
+# Parent ace064424fb988665b12cac1a1189afb068d4fc5
+
+diff --git a/config/cc/gcc.in b/config/cc/gcc.in
+--- a/config/cc/gcc.in
++++ b/config/cc/gcc.in
+@@ -36,6 +36,11 @@
+ # Don't remove next line
+ # CT_INSERT_VERSION_BELOW
+ 
++config CC_V_4_8_0
++    bool
++    prompt "4.8.0"
++    select CC_GCC_4_8
++
+ config CC_V_linaro_4_7
+     bool
+     prompt "linaro-4.7-2013.04"
+@@ -316,6 +321,18 @@
+     bool
+     select CC_GCC_4_6_or_later
+ 
++config CC_GCC_4_8
++    bool
++    select CC_GCC_4_7_or_later
++    select CC_GCC_USE_GMP_MPFR
++    select CC_GCC_USE_MPC
++    select CC_GCC_HAS_GRAPHITE
++    select CC_GCC_HAS_LTO
++    select CC_GCC_HAS_PKGVERSION_BUGURL
++    select CC_GCC_HAS_BUILD_ID
++    select CC_GCC_HAS_LNK_HASH_STYLE
++    select CC_GCC_HAS_LIBQUADMATH
++
+ config CC_GCC_latest
+     bool
+     select CC_GCC_4_7_or_later
+@@ -391,6 +408,7 @@
+     string
+ # Don't remove next line
+ # CT_INSERT_VERSION_STRING_BELOW
++    default "4.8.0" if CC_V_4_8_0
+     default "linaro-4.7-2013.04" if CC_V_linaro_4_7
+     default "4.7.3" if CC_V_4_7_3
+     default "4.7.2" if CC_V_4_7_2
 # HG changeset patch
-# Parent ffb1dc502454bb76adc713b026efbe0c65dc0db3
+# Parent 81f386413c6281bf9d434b986a5c70e2011608d7
 
 diff --git a/patches/ppl/0.11.2/101-fix-gmp-5.1.0.patch b/patches/ppl/0.11.2/101-fix-gmp-5.1.0.patch
 new file mode 100644
 + #include "mp_std_bits.inlines.hh" 
 +  
 + #endif // !defined(PPL_mp_std_bits_defs_hh) 
-diff --git a/patches/ppl/0.12.1/101-fix-gmp-5.1.0.patch b/patches/ppl/0.12.1/101-fix-gmp-5.1.0.patch
+diff --git a/patches/ppl/0.12.1/102-fix-gmp-5.1.0.patch b/patches/ppl/0.12.1/102-fix-gmp-5.1.0.patch
 new file mode 100644
 --- /dev/null
-+++ b/patches/ppl/0.12.1/101-fix-gmp-5.1.0.patch
-@@ -0,0 +1,41 @@
-+--- a/src/p_std_bits.cc.org   2012-12-30 00:37:03.033948083 +0100 
-++++ b/src/mp_std_bits.cc   2012-12-30 00:44:12.893019313 +0100 
-+@@ -25,6 +25,9 @@ 
-+ #include "ppl-config.h" 
-+ #include "mp_std_bits.defs.hh" 
-+  
-++#if __GNU_MP_VERSION < 5 \ 
-++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) 
-++ 
-+ const bool std::numeric_limits<mpz_class>::is_specialized; 
-+ const int std::numeric_limits<mpz_class>::digits; 
-+ const int std::numeric_limits<mpz_class>::digits10; 
-+@@ -70,3 +73,6 @@ 
-+ const bool std::numeric_limits<mpq_class>::traps; 
-+ const bool std::numeric_limits<mpq_class>::tininess_before; 
-+ const std::float_round_style std::numeric_limits<mpq_class>::round_style; 
-++ 
-++#endif // __GNU_MP_VERSION < 5 
-++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) 
-+--- a/src/mp_std_bits.defs.hh.org   2012-12-30 00:37:03.037948187 +0100 
-++++ b/src/mp_std_bits.defs.hh   2012-12-30 00:42:32.002424189 +0100 
-+@@ -38,6 +38,9 @@ 
-+ #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) 
-+ void swap(mpq_class& x, mpq_class& y); 
-+  
-++#if __GNU_MP_VERSION < 5 \ 
-++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) 
-++ 
-+ namespace std { 
-+  
-+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS 
-+@@ -164,6 +167,9 @@ 
-+  
-+ } // namespace std 
-+  
-++#endif // __GNU_MP_VERSION < 5 
-++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) 
-++ 
-+ #include "mp_std_bits.inlines.hh" 
-+  
-+ #endif // !defined(PPL_mp_std_bits_defs_hh) 
++++ b/patches/ppl/0.12.1/102-fix-gmp-5.1.0.patch
+@@ -0,0 +1,39 @@
++--- a/src/mp_std_bits.cc	2013-05-14 19:30:32.095181024 -0500
+++++ b/src/mp_std_bits.cc	2013-05-14 19:31:26.791844703 -0500
++@@ -25,6 +25,9 @@ site: http://bugseng.com/products/ppl/ .
++ #include "ppl-config.h"
++ #include "mp_std_bits.defs.hh"
++ 
+++#if __GNU_MP_VERSION < 5 \
+++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
+++
++ const bool std::numeric_limits<mpz_class>::is_specialized;
++ const int std::numeric_limits<mpz_class>::digits;
++ const int std::numeric_limits<mpz_class>::digits10;
++@@ -70,3 +73,5 @@ const bool std::numeric_limits<mpq_class
++ const bool std::numeric_limits<mpq_class>::traps;
++ const bool std::numeric_limits<mpq_class>::tininess_before;
++ const std::float_round_style std::numeric_limits<mpq_class>::round_style;
+++
+++#endif
++--- a/src/mp_std_bits.defs.hh	2013-05-14 19:32:19.071841846 -0500
+++++ b/src/mp_std_bits.defs.hh	2013-05-14 19:33:05.038506001 -0500
++@@ -38,6 +38,9 @@ void swap(mpz_class& x, mpz_class& y);
++ #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
++ void swap(mpq_class& x, mpq_class& y);
++ 
+++#if __GNU_MP_VERSION < 5 \
+++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
+++
++ namespace std {
++ 
++ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
++@@ -164,6 +167,8 @@ public:
++ 
++ } // namespace std
++ 
+++#endif
+++
++ #include "mp_std_bits.inlines.hh"
++ 
++ #endif // !defined(PPL_mp_std_bits_defs_hh)
 # HG changeset patch
-# Parent ba9b9b943b197dd292e6fd961f9045166d988367
+# Parent a652fb53c9a858850c78d6692d55162ed5d12b2c
 
 diff --git a/config/companion_libs/ppl.in b/config/companion_libs/ppl.in
 --- a/config/companion_libs/ppl.in
 +++ b/config/companion_libs/ppl.in
-@@ -6,6 +6,16 @@
+@@ -6,6 +6,10 @@
  # Don't remove next line
  # CT_INSERT_VERSION_BELOW
  
-+config PPL_V_1_0
-+    bool
-+    prompt "1.0"
-+    select PPL_0_11
-+
 +config PPL_V_0_12_1
 +    bool
 +    prompt "0.12.1"
-+    select PPL_0_11
 +
  config PPL_V_0_11_2
      bool
      prompt "0.11.2"
-@@ -32,6 +42,8 @@
+@@ -32,6 +36,7 @@
      string
  # Don't remove next line
  # CT_INSERT_VERSION_STRING_BELOW
-+    default "1.0" if PPL_V_1_0
 +    default "0.12.1" if PPL_V_0_12_1
      default "0.11.2" if PPL_V_0_11_2
      default "0.11.1" if PPL_V_0_11_1
      default "0.11" if PPL_V_0_11
+@@ -49,3 +54,4 @@
+ 
+ config PPL_NEEDS_LIBPWL
+     bool
++    default n

ppl-update2

-# HG changeset patch
-# Parent 55e4becd7579965e902e068a4264c5a6979236d0
-diff --git a/config/companion_libs/ppl.in b/config/companion_libs/ppl.in
---- a/config/companion_libs/ppl.in
-+++ b/config/companion_libs/ppl.in
-@@ -6,15 +6,9 @@
- # Don't remove next line
- # CT_INSERT_VERSION_BELOW
- 
--config PPL_V_1_0
--    bool
--    prompt "1.0"
--    select PPL_0_11
--
- config PPL_V_0_12_1
-     bool
-     prompt "0.12.1"
--    select PPL_0_11
- 
- config PPL_V_0_11_2
-     bool
-@@ -42,7 +36,6 @@
-     string
- # Don't remove next line
- # CT_INSERT_VERSION_STRING_BELOW
--    default "1.0" if PPL_V_1_0
-     default "0.12.1" if PPL_V_0_12_1
-     default "0.11.2" if PPL_V_0_11_2
-     default "0.11.1" if PPL_V_0_11_1

ppl-update3

-# HG changeset patch
-# Parent 7e2d5b6b3aed65bf9a6da9651ca109eb945ae3cb
-diff --git a/config/companion_libs/ppl.in b/config/companion_libs/ppl.in
---- a/config/companion_libs/ppl.in
-+++ b/config/companion_libs/ppl.in
-@@ -54,3 +54,4 @@
- 
- config PPL_NEEDS_LIBPWL
-     bool
-+    default n
 gdb-7.5.1.diff
 ppl-update
 ppl-patches
-ppl-update2
-ppl-update3
 arch-float-auto
 ppl-pwl-hack
+gcc-4.8