[ghc-rpm-macros] fix self-bootstrap check

Jens Petersen petersen at fedoraproject.org
Mon Mar 28 07:45:23 UTC 2011


commit 78a6eab552a77a853e1fa8584f5e1a4756ecc1cd
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Mar 28 16:45:18 2011 +0900

    fix self-bootstrap check

 ghc-rpm-macros.ghc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 17f5c49..1a86d72 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -8,11 +8,11 @@
 # configure
 %cabal_configure\
 %if %{undefined ghc_bootstrap}\
-if ! ghc --info | grep -q "(\"Booter version\",\"%{ghc_version}\")"; then\
-  echo "Aborting since this ghc build is not ABI self-bootstrapped.\
+if [ ! "$(ghc --info | grep \\"Booter\\ version\\",\\"%{ghc_version}\\")" ]; then\
+  echo "Aborting since this ghc version build is not self-bootstrapped.\
 The ghc package should be rebuilt against its current version first\
-to prevent avoid any potential future dependency breakage.\
-(This can be overridden by defining ghc_bootstrap at your own risk.)"\
+to prevent dependency ABI breakage with a future ghc rebuild.\
+(This can be overridden at your own risk by defining ghc_bootstrap.)"\
   exit 1\
 fi\
 %endif\


More information about the scm-commits mailing list