silence the ghc-pkg abi-depends warnings when installing packages

forward-port from f28 branch

D4159.patch

@@ -1,147 +1,3 @@
-diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
---- a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
-+++ b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
-@@ -1,6 +1,11 @@
-+ignoring (possibly broken) abi-depends field for packages
-+ignoring (possibly broken) abi-depends field for packages
- Preprocessing library 'p' for bkpcabal01-0.1.0.0..
- Building library 'p' instantiated with H = <H>
- for bkpcabal01-0.1.0.0..
-+ignoring (possibly broken) abi-depends field for packages
- Preprocessing library 'q' for bkpcabal01-0.1.0.0..
- Building library 'q' instantiated with H = <H>
- for bkpcabal01-0.1.0.0..
-+ignoring (possibly broken) abi-depends field for packages
-+ignoring (possibly broken) abi-depends field for packages
-diff --git a/testsuite/tests/cabal/T12485a.stdout b/testsuite/tests/cabal/T12485a.stdout
---- a/testsuite/tests/cabal/T12485a.stdout
-+++ b/testsuite/tests/cabal/T12485a.stdout
-@@ -1,3 +1,4 @@
-+ignoring (possibly broken) abi-depends field for packages
- should SUCCEED
- should SUCCEED
- should SUCCEED
-diff --git a/testsuite/tests/cabal/T5442d.stdout b/testsuite/tests/cabal/T5442d.stdout
---- a/testsuite/tests/cabal/T5442d.stdout
-+++ b/testsuite/tests/cabal/T5442d.stdout
-@@ -1,6 +1,7 @@
- Reading package info from "shadow1.pkg" ... done.
- Reading package info from "shadow4.pkg" ... done.
- Reading package info from "shadow2.pkg" ... done.
-+ignoring (possibly broken) abi-depends field for packages
- global (should be empty):
- user:
- shadow-2
-diff --git a/testsuite/tests/cabal/cabal01/cabal01.stdout b/testsuite/tests/cabal/cabal01/cabal01.stdout
---- a/testsuite/tests/cabal/cabal01/cabal01.stdout
-+++ b/testsuite/tests/cabal/cabal01/cabal01.stdout
-@@ -1,3 +1,4 @@
-+ignoring (possibly broken) abi-depends field for packages
- install1:
- bin
- lib
-diff --git a/testsuite/tests/cabal/cabal06/cabal06.stdout b/testsuite/tests/cabal/cabal06/cabal06.stdout
---- a/testsuite/tests/cabal/cabal06/cabal06.stdout
-+++ b/testsuite/tests/cabal/cabal06/cabal06.stdout
-@@ -1,3 +1,7 @@
-+ignoring (possibly broken) abi-depends field for packages
-+ignoring (possibly broken) abi-depends field for packages
-+ignoring (possibly broken) abi-depends field for packages
-+ignoring (possibly broken) abi-depends field for packages
- Does the first instance of q depend on p-1.0?
- 1
- Does the second instance of q depend on p-1.0?
-diff --git a/testsuite/tests/cabal/cabal08/cabal08.stdout b/testsuite/tests/cabal/cabal08/cabal08.stdout
---- a/testsuite/tests/cabal/cabal08/cabal08.stdout
-+++ b/testsuite/tests/cabal/cabal08/cabal08.stdout
-@@ -1,3 +1,5 @@
-+ignoring (possibly broken) abi-depends field for packages
-+ignoring (possibly broken) abi-depends field for packages
- [1 of 1] Compiling Main             ( Main.hs, Main.o )
- Linking Main ...
- p2
-diff --git a/testsuite/tests/cabal/shadow.stdout b/testsuite/tests/cabal/shadow.stdout
---- a/testsuite/tests/cabal/shadow.stdout
-+++ b/testsuite/tests/cabal/shadow.stdout
-@@ -1,3 +1,4 @@
-+ignoring (possibly broken) abi-depends field for packages
- databases 1 and 2:
- localshadow1.package.conf
-     (shadow-1)
-diff --git a/testsuite/tests/driver/recomp007/recomp007.stdout b/testsuite/tests/driver/recomp007/recomp007.stdout
---- a/testsuite/tests/driver/recomp007/recomp007.stdout
-+++ b/testsuite/tests/driver/recomp007/recomp007.stdout
-@@ -1,3 +1,5 @@
-+ignoring (possibly broken) abi-depends field for packages
-+ignoring (possibly broken) abi-depends field for packages
- Preprocessing executable 'test' for b-1.0..
- Building executable 'test' for b-1.0..
- [1 of 2] Compiling B                ( B.hs, dist/build/test/test-tmp/B.o ) [A changed]
-diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
---- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
-+++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
-@@ -1,49 +1,53 @@
-+ignoring (possibly broken) abi-depends field for packages
- pdb.safePkg01/local.db
-     safePkg01-1.0
- 
- trusted: False
- 
- M_SafePkg
--package dependencies: base-4.9.0.0* ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
-+package dependencies: base-4.11.0.0* ghc-prim-0.5.2.0 integer-gmp-1.0.1.0
- trusted: safe
- require own pkg trusted: False
- 
- M_SafePkg2
--package dependencies: base-4.9.0.0 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
-+package dependencies: base-4.11.0.0 ghc-prim-0.5.2.0 integer-gmp-1.0.1.0
- trusted: trustworthy
- require own pkg trusted: False
- 
- M_SafePkg3
--package dependencies: base-4.9.0.0* ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
-+package dependencies: base-4.11.0.0* ghc-prim-0.5.2.0 integer-gmp-1.0.1.0
- trusted: safe
- require own pkg trusted: True
- 
- M_SafePkg4
--package dependencies: base-4.9.0.0* ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
-+package dependencies: base-4.11.0.0* ghc-prim-0.5.2.0 integer-gmp-1.0.1.0
- trusted: safe
- require own pkg trusted: True
- 
- M_SafePkg5
--package dependencies: base-4.9.0.0* ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
-+package dependencies: base-4.11.0.0* ghc-prim-0.5.2.0 integer-gmp-1.0.1.0
- trusted: safe
- require own pkg trusted: True
- 
- M_SafePkg6
--package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
-+package dependencies: array-0.5.2.0 base-4.11.0.0* bytestring-0.10.8.2* deepseq-1.4.3.0 ghc-prim-0.5.2.0 integer-gmp-1.0.1.0
- trusted: trustworthy
- require own pkg trusted: False
- 
- M_SafePkg7
--package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
-+package dependencies: array-0.5.2.0 base-4.11.0.0* bytestring-0.10.8.2* deepseq-1.4.3.0 ghc-prim-0.5.2.0 integer-gmp-1.0.1.0
- trusted: safe
- require own pkg trusted: False
- 
- M_SafePkg8
--package dependencies: array-0.5.1.0 base-4.9.0.0 bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
-+package dependencies: array-0.5.2.0 base-4.11.0.0 bytestring-0.10.8.2* deepseq-1.4.3.0 ghc-prim-0.5.2.0 integer-gmp-1.0.1.0
- trusted: trustworthy
- require own pkg trusted: False
- 
- Testing setting trust
-+ignoring (possibly broken) abi-depends field for packages
- trusted: True
-+ignoring (possibly broken) abi-depends field for packages
- trusted: False
-+ignoring (possibly broken) abi-depends field for packages
- trusted: False
 diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
 --- a/utils/ghc-pkg/Main.hs
 +++ b/utils/ghc-pkg/Main.hs
@@ -158,10 +14,10 @@ diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
 +      hasAnyAbiDepends :: InstalledPackageInfo -> Bool
 +      hasAnyAbiDepends x = length (abiDepends x) > 0
 +
-+  -- warn when we find any (possibly-)bogus abi-depends fields;
++--  -- warn when we find any (possibly-)bogus abi-depends fields;
-+  -- Note [Recompute abi-depends]
++--  -- Note [Recompute abi-depends]
-+  when (any hasAnyAbiDepends pkgsCabalFormat) $
++--  when (any hasAnyAbiDepends pkgsCabalFormat) $
-+      infoLn "ignoring (possibly broken) abi-depends field for packages"
++--       infoLn "ignoring (possibly broken) abi-depends field for packages"
  
    when (verbosity > Normal) $
        infoLn ("writing cache " ++ filename)

ghc.spec

@@ -593,11 +593,14 @@ fi
 
 
 %changelog
-* Wed May  2 2018 Jens Petersen <petersen@redhat.com> - 8.2.2-66
+* Wed May  2 2018 Jens Petersen <petersen@redhat.com> - 8.2.2-67
 - move manuals to ghc-doc
 - ghost the ghc-doc-index local state files
 - ghost some newer libraries index files
 
+* Tue Apr 10 2018 Jens Petersen <petersen@redhat.com> - 8.2.2-66
+- ghc-pkg: silence the abi-depends warnings
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 8.2.2-65
 - Escape macros in %%changelog