From 494c76ae55246692b4cc9cf0f006a8243e04772e Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Sat, 18 Feb 2017 00:35:18 +0900
Subject: [PATCH] fix ABI check for uninstalled package
(which may be redundant now)
ghc-xhtml is not built for bootstrap, so check was failing
---
ghc.spec | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/ghc.spec b/ghc.spec
index 6e8a2d5..e4bba12 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -422,13 +422,17 @@ make test
echo "Checking package ABI hashes:"
for i in %{ghc_packages_list}; do
old=$(ghc-pkg 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
- ghc_abi_hash_change=yes
+ if [ -n "$old" ]; then
+ 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
+ ghc_abi_hash_change=yes
+ else
+ echo "($old unchanged)"
+ fi
else
- echo "($old unchanged)"
+ echo "($i not installed)"
fi
done
if [ "$ghc_abi_hash_change" = "yes" ]; then