From 2a8e5b42681ed776b26c965c8c7b15ca6a46cef4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 30 Jan 2023 20:08:01 +0800 Subject: [PATCH] actually update configure for ghc-configure-c99.patch --- ghc.spec | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/ghc.spec b/ghc.spec index ce0ddeb..33690cf 100644 --- a/ghc.spec +++ b/ghc.spec @@ -169,6 +169,10 @@ BuildRequires: gcc-c++ # for terminfo BuildRequires: ncurses-devel BuildRequires: perl-interpreter +# needed for: +# - binary-dist-dir +# - patch11 and patch12 +BuildRequires: autoconf automake %if %{with testsuite} BuildRequires: python3 %endif @@ -185,8 +189,6 @@ BuildRequires: elfutils-devel #BuildRequires: gnupg2 %endif %if %{with hadrian} -# needed for binary-dist-dir -BuildRequires: autoconf automake %if %{with build_hadrian} BuildRequires: ghc-Cabal-static BuildRequires: ghc-QuickCheck-static @@ -207,11 +209,6 @@ BuildRequires: happy %else BuildRequires: %{name}-hadrian %endif -%else -%ifarch armv7hl -# patch12 -BuildRequires: autoconf automake -%endif %endif Requires: %{name}-compiler = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} @@ -501,10 +498,8 @@ EOF %build -# for patch12 -%ifarch armv7hl +# for patch11 autoreconf -%endif %ghc_set_gcc_flags export CC=%{_bindir}/gcc