From 5f1ed338cf5b76dc8be0266dbd2d146c285ede767ed056da68a6102cd2e1e2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:47 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-cassava revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-cassava?expand=0&rev=7 --- ghc-cassava.changes | 5 +++++ ghc-cassava.spec | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ghc-cassava.changes b/ghc-cassava.changes index 359ba9c..0ed9e11 100644 --- a/ghc-cassava.changes +++ b/ghc-cassava.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Mon Aug 31 09:34:31 UTC 2020 - psimons@suse.com diff --git a/ghc-cassava.spec b/ghc-cassava.spec index d22428a..1449332 100644 --- a/ghc-cassava.spec +++ b/ghc-cassava.spec @@ -41,6 +41,12 @@ BuildRequires: ghc-text-short-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel @@ -86,7 +92,7 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal %build