From c5902ba33fe7bd22b765c9f30e9de4cdcb267188 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: May 07 2015 10:14:08 +0000 Subject: %cabal now uses utf8 locale; set %ghc_without_dynamic on aarch64 --- diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 2211ad7..f59c197 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -6,7 +6,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.4.14 +Version: 1.4.15 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -91,6 +91,15 @@ install -p -D -m 0644 %{SOURCE8} %{buildroot}/%{_prefix}/lib/rpm/fileattrs/ghc_l install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag +# turn off dynamic linking on arm64 +%ifarch aarch64 +cat >> %{buildroot}/%{macros_dir}/macros.ghc < - 1.4.15-1 +- cabal macro now sets utf8 locale +- disable dynamic linking on aarch64 as a workaround (#1195231) + * Thu Apr 2 2015 Jens Petersen - 1.4.14-1 - add explicit --enable-shared again for arm64 diff --git a/macros.ghc b/macros.ghc index ca027c2..5e36f1d 100644 --- a/macros.ghc +++ b/macros.ghc @@ -3,6 +3,7 @@ # "cabal" %cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:-no-user-package-db} %{!?ghc_without_dynamic:-dynamic} Setup\ +LANG=en_US.utf8\ ./Setup # check ghc version was rebuilt against self