[commit: packages/bytestring] ghc-head: Use 'integer-simple' flag analogous to the 'text' library. (4720784)

[git at git.haskell.org]

Repository : ssh://git at git.haskell.org/bytestring

On branch  : ghc-head
Link       : http://git.haskell.org/packages/bytestring.git/commitdiff/472078464a90c9741b9d1748cde0fcd70a7ba012

>---------------------------------------------------------------

commit 472078464a90c9741b9d1748cde0fcd70a7ba012
Author: Simon Meier <simon.meier at erudify.com>
Date:   Tue Sep 17 19:59:24 2013 +0200

    Use 'integer-simple' flag analogous to the 'text' library.


>---------------------------------------------------------------

472078464a90c9741b9d1748cde0fcd70a7ba012
 bench/bench-bytestring.cabal |   13 ++++++++++---
 bytestring.cabal             |    9 +++++++--
 tests/bytestring-tests.cabal |   10 ++++++++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/bench/bench-bytestring.cabal b/bench/bench-bytestring.cabal
index dfcfd32..f0ce82e 100644
--- a/bench/bench-bytestring.cabal
+++ b/bench/bench-bytestring.cabal
@@ -25,6 +25,10 @@ source-repository head
   type:     darcs
   location: http://darcs.haskell.org/bytestring/
 
+flag integer-simple
+  description: Use the simple integer library instead of GMP
+  default: False
+
 executable bench-bytestring-builder
   hs-source-dirs:    . ..
   main-is:           BenchAll.hs
@@ -52,13 +56,16 @@ executable bench-bytestring-builder
                     -fdicts-cheap
                     -fspec-constr-count=6
 
+  -- flags for the decimal integer serialization code
   if impl(ghc >= 6.11)
-    cpp-options: -DINTEGER_GMP
-    build-depends: integer-gmp >= 0.2
+    if !flag(integer-simple)
+      cpp-options: -DINTEGER_GMP
+      build-depends: integer-gmp >= 0.2
 
   if impl(ghc >= 6.9) && impl(ghc < 6.11)
     cpp-options: -DINTEGER_GMP
-    build-depends: integer >= 0.1
+    build-depends: integer >= 0.1 && < 0.2
+
 
   if impl(ghc)
     extensions:   UnliftedFFITypes,
diff --git a/bytestring.cabal b/bytestring.cabal
index 59c24ca..de30f6a 100644
--- a/bytestring.cabal
+++ b/bytestring.cabal
@@ -60,6 +60,10 @@ source-repository head
   type:     git
   location: https://github.com/haskell/bytestring
 
+flag integer-simple
+  description: Use the simple integer library instead of GMP
+  default: False
+
 library
   build-depends:     base >= 4.2 && < 5, ghc-prim, deepseq
 
@@ -119,8 +123,9 @@ library
 
    -- flags for the decimal integer serialization code
   if impl(ghc >= 6.11)
-    cpp-options: -DINTEGER_GMP
-    build-depends: integer-gmp >= 0.2 && < 0.6
+    if !flag(integer-simple)
+      cpp-options: -DINTEGER_GMP
+      build-depends: integer-gmp >= 0.2
 
   if impl(ghc >= 6.9) && impl(ghc < 6.11)
     cpp-options: -DINTEGER_GMP
diff --git a/tests/bytestring-tests.cabal b/tests/bytestring-tests.cabal
index 04bbe13..f78981a 100644
--- a/tests/bytestring-tests.cabal
+++ b/tests/bytestring-tests.cabal
@@ -14,6 +14,11 @@ category:      Data
 build-type:    Simple
 cabal-version: >=1.8
 
+
+flag integer-simple
+  description: Use the simple integer library instead of GMP
+  default: False
+
 -- QC properties, with GHC RULES disabled
 executable prop-compiled
   main-is:          Properties.hs
@@ -76,8 +81,9 @@ executable test-builder
 
    -- flags for the decimal integer serialization code
   if impl(ghc >= 6.11)
-    cpp-options: -DINTEGER_GMP
-    build-depends: integer-gmp >= 0.2 && < 0.6
+    if !flag(integer-simple)
+      cpp-options: -DINTEGER_GMP
+      build-depends: integer-gmp >= 0.2
 
   if impl(ghc >= 6.9) && impl(ghc < 6.11)
     cpp-options: -DINTEGER_GMP