From 7207ea44ed0f8cde134e8da5906ae014659a4aac1f44cba14c9662bb57359598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:51:45 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-bootstrap-helpers revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap-helpers?expand=0&rev=10 --- ghc-bootstrap-helpers.changes | 5 +++++ ghc-bootstrap-helpers.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ghc-bootstrap-helpers.changes b/ghc-bootstrap-helpers.changes index 82d81d1..11e86a1 100644 --- a/ghc-bootstrap-helpers.changes +++ b/ghc-bootstrap-helpers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Tue Sep 8 09:28:13 UTC 2020 - Ondřej Súkup diff --git a/ghc-bootstrap-helpers.spec b/ghc-bootstrap-helpers.spec index 0bd2b64..fbfc03e 100644 --- a/ghc-bootstrap-helpers.spec +++ b/ghc-bootstrap-helpers.spec @@ -27,6 +27,12 @@ URL: https://build.opensuse.org/project/show/devel:languages:haskell Source: alex-%{alex_ver}.tar.gz Source1: happy-%{happy_ver}.tar.gz BuildRequires: ghc-bootstrap +# 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 # This package is not meant to be used outside OBS Requires: this-is-only-for-build-envs From 54c31e3fa25fbb5a439a31c2d92f69d1c754cfea2a7d0d3a54a5c18b40c18b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:47:42 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-bootstrap-helpers revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap-helpers?expand=0&rev=11 --- ghc-bootstrap-helpers.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-bootstrap-helpers.changes b/ghc-bootstrap-helpers.changes index 11e86a1..d0b3ef9 100644 --- a/ghc-bootstrap-helpers.changes +++ b/ghc-bootstrap-helpers.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 ------------------------------------------------------------------- Tue Sep 8 09:28:13 UTC 2020 - Ondřej Súkup From 7d7b3727a6f3fda0a683b28cf48e259def07e3f545155ce701bc343deada26b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:28:08 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-bootstrap-helpers revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap-helpers?expand=0&rev=12 --- ghc-bootstrap-helpers.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-bootstrap-helpers.changes b/ghc-bootstrap-helpers.changes index d0b3ef9..07196d2 100644 --- a/ghc-bootstrap-helpers.changes +++ b/ghc-bootstrap-helpers.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 From dc4de7d8401f47ab22122bd6d48557fb00d4470496f0c8b78908a0ec745e1b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:59:53 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-bootstrap-helpers revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bootstrap-helpers?expand=0&rev=13 --- ghc-bootstrap-helpers.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ghc-bootstrap-helpers.spec b/ghc-bootstrap-helpers.spec index fbfc03e..e4fc08d 100644 --- a/ghc-bootstrap-helpers.spec +++ b/ghc-bootstrap-helpers.spec @@ -27,12 +27,7 @@ URL: https://build.opensuse.org/project/show/devel:languages:haskell Source: alex-%{alex_ver}.tar.gz Source1: happy-%{happy_ver}.tar.gz BuildRequires: ghc-bootstrap -# 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} # This package is not meant to be used outside OBS Requires: this-is-only-for-build-envs