From 47c247655af3bc18dc19dd3431d5d20aedb72092 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 24 Jul 2013 14:18:09 +0900 Subject: [PATCH] Revert "temporary bootstrap build for ARM with llvm-3.3 fix" This reverts commit a044dc3f8af30144c9639d83d2c6db8f2895a1a6. --- ghc.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ghc.spec b/ghc.spec index 676ed0d..ca0ac89 100644 --- a/ghc.spec +++ b/ghc.spec @@ -2,10 +2,10 @@ # (disabled for other archs in ghc-rpm-macros) # To bootstrap build a new version of ghc, uncomment the following: -%global ghc_bootstrapping 1 -%{?ghc_bootstrap} -%global without_testsuite 1 -%global without_haddock 1 +#%%global ghc_bootstrapping 1 +#%%{?ghc_bootstrap} +#%%global without_testsuite 1 +#%%global without_haddock 1 # To do a test build instead with shared libs, uncomment the following: #%%global ghc_bootstrapping 1 @@ -29,7 +29,7 @@ Version: 7.6.3 # - release can only be reset if *all* library versions get bumped simultaneously # (sometimes after a major release) # - minor release numbers for a branch should be incremented monotonically -Release: 14.1%{?dist} +Release: 16%{?dist} Summary: Glasgow Haskell Compiler License: %BSDHaskellReport @@ -439,8 +439,13 @@ fi %changelog -* Wed Jul 24 2013 Jens Petersen - 7.6.3-14.1 -- temporary bootstrap build for ARM with llvm-3.3 fix +* Thu Jul 11 2013 Jens Petersen - 7.6.3-16 +- revert the executable stack patch since it didn't fully fix the problem + and yet changed the ghc library hash + +* Wed Jul 10 2013 Jens Petersen - 7.6.3-15 +- turn off executable stack flag in executables (#973512) + (thanks Edward Zhang for upstream patch and Dhiru Kholia for report) * Tue Jun 25 2013 Jens Petersen - 7.6.3-14 - fix compilation with llvm-3.3 (#977652)