From 37ccbdff38f31465c69bc78ed66d61eedbf0c73c919644ff602ab4ed089f136b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:09 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-ghc-lib-parser-ex revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-ghc-lib-parser-ex?expand=0&rev=8 --- ghc-ghc-lib-parser-ex.changes | 5 +++++ ghc-ghc-lib-parser-ex.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-ghc-lib-parser-ex.changes b/ghc-ghc-lib-parser-ex.changes index 6ae4132..89e77d3 100644 --- a/ghc-ghc-lib-parser-ex.changes +++ b/ghc-ghc-lib-parser-ex.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Wed Aug 19 07:30:38 UTC 2020 - Michel Normand diff --git a/ghc-ghc-lib-parser-ex.spec b/ghc-ghc-lib-parser-ex.spec index 781b707..42a6d3a 100644 --- a/ghc-ghc-lib-parser-ex.spec +++ b/ghc-ghc-lib-parser-ex.spec @@ -33,6 +33,12 @@ BuildRequires: ghc-ghc-boot-th-devel BuildRequires: ghc-ghc-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-uniplate-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-directory-devel BuildRequires: ghc-extra-devel From 1d327fc446ca0a082b0ea234c1b69af5c5a963dd90d00bb6d161da52f8fffc81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:48:07 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-ghc-lib-parser-ex revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-ghc-lib-parser-ex?expand=0&rev=9 --- ghc-ghc-lib-parser-ex.changes | 2 +- ghc-ghc-lib-parser-ex.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-ghc-lib-parser-ex.changes b/ghc-ghc-lib-parser-ex.changes index 89e77d3..1ddc93e 100644 --- a/ghc-ghc-lib-parser-ex.changes +++ b/ghc-ghc-lib-parser-ex.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup -- force i686 arch on i586 +- disable %{ix86} build ------------------------------------------------------------------- Wed Aug 19 07:30:38 UTC 2020 - Michel Normand diff --git a/ghc-ghc-lib-parser-ex.spec b/ghc-ghc-lib-parser-ex.spec index 42a6d3a..84818ea 100644 --- a/ghc-ghc-lib-parser-ex.spec +++ b/ghc-ghc-lib-parser-ex.spec @@ -33,12 +33,7 @@ BuildRequires: ghc-ghc-boot-th-devel BuildRequires: ghc-ghc-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-uniplate-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 +ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-directory-devel BuildRequires: ghc-extra-devel From 676ab3ee48b577246079f9550b65d8fe8a6de9659b1046b578cec8d553d4d158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:37 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-ghc-lib-parser-ex revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-ghc-lib-parser-ex?expand=0&rev=10 --- ghc-ghc-lib-parser-ex.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-ghc-lib-parser-ex.changes b/ghc-ghc-lib-parser-ex.changes index 1ddc93e..a3f6fd5 100644 --- a/ghc-ghc-lib-parser-ex.changes +++ b/ghc-ghc-lib-parser-ex.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup +Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - disable %{ix86} build