From 4fd9c1754c991df561a04e03097f1f54bbc0584d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 14 Jul 2016 14:55:11 +0900 Subject: [PATCH] more ABI hash fix/improvements --- ghc.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ghc.spec b/ghc.spec index ab99d0f..6d0ec91 100644 --- a/ghc.spec +++ b/ghc.spec @@ -434,19 +434,22 @@ make test # check the ABI hashes %if %{undefined ghc_bootstrapping} -echo "Checking package ABI hashes..." +echo "Checking package ABI hashes:" for i in %{ghc_packages_list}; do old=$(ghc-pkg field $i id --simple-output) - new=$(/usr/libexec/ghc-pkg/wrapper %{buildroot}%{ghclibdir} field $i id --simple-output) + new=$(/usr/lib/rpm/ghc-pkg-wrapper %{buildroot}%{ghclibdir} field $i id --simple-output) if [ "$old" != "$new" ]; then echo "ABI hash for $i changed!:" >&2 echo " $old -> $new" >&2 - exit 1 + ghc_abi_hash_change=yes else echo "($old unchanged)" fi done -echo "done." +if [ "$ghc_abi_hash_change" = "yes" ]; then + echo "ghc ABI hash change: aborting build!" >&2 + exit 1 +fi %endif