[commit: ghc] master: Update to binary 0.7.0.0 (3ea331b)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3ea331b7f915373e1f8db6000a1a5bb4a63f12f9

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

commit 3ea331b7f915373e1f8db6000a1a5bb4a63f12f9
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Mar 1 13:59:21 2013 +0000

    Update to binary 0.7.0.0

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

 libraries/bin-package-db/bin-package-db.cabal | 2 +-
 libraries/binary                              | 2 +-
 mk/validate-settings.mk                       | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/libraries/bin-package-db/bin-package-db.cabal b/libraries/bin-package-db/bin-package-db.cabal
index ce023d4..7fde05d 100644
--- a/libraries/bin-package-db/bin-package-db.cabal
+++ b/libraries/bin-package-db/bin-package-db.cabal
@@ -24,7 +24,7 @@ Library {
     else
         build-depends: base >= 4 && < 5
 
-    build-depends: binary == 0.5.*,
+    build-depends: binary >= 0.5 && < 0.8,
                    Cabal >= 1.8 && < 1.18
 
     extensions: CPP
diff --git a/libraries/binary b/libraries/binary
index feb2873..4d890e4 160000
--- a/libraries/binary
+++ b/libraries/binary
@@ -1 +1 @@
-Subproject commit feb287316af6b4acfbb4c54553ec55d8b10012d2
+Subproject commit 4d890e4465a0494e5fd80fbcf1fb339d8bd5800d
diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk
index 399bf0e..e2f66f2 100644
--- a/mk/validate-settings.mk
+++ b/mk/validate-settings.mk
@@ -104,9 +104,8 @@ libraries/time_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports -fno-warn-
 libraries/haskeline_dist-install_EXTRA_HC_OPTS += -fno-warn-deprecations
 libraries/haskeline_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports
 
-# Temporarily turn off unused-import warnings for the binary package
-libraries/binary_dist-boot_EXTRA_HC_OPTS += -fno-warn-unused-imports
-libraries/binary_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports -fno-warn-identities
+# binary upstream has some warnings, so don't use -Werror for it
+libraries/binary_dist-install_EXTRA_HC_OPTS += -Wwarn
 
 # temporarily turn off -Werror for mtl
 libraries/mtl_dist-install_EXTRA_HC_OPTS += -Wwarn
@@ -129,9 +128,6 @@ libraries/dph/dph-lifted-common-install_EXTRA_HC_OPTS += -Wwarn
 
 # We need to turn of deprecated warnings for SafeHaskell transition
 libraries/array_dist-install_EXTRA_HC_OPTS += -fno-warn-warnings-deprecations
-libraries/binary_dist-install_EXTRA_HC_OPTS += -fno-warn-warnings-deprecations
-libraries/binary/src/Data/Binary/Builder/Base_HC_OPTS += -fno-warn-warnings-deprecations
-libraries/binary/src/Data/Binary/Get_HC_OPTS += -fno-warn-warnings-deprecations
 
 # Temporarely disable inline rule shadowing warning
 libraries/bytestring_dist-install_EXTRA_HC_OPTS += -fno-warn-inline-rule-shadowing