diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 969fdd5..8f8d9b9 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.7 +Version: 1.4.8 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -72,16 +72,6 @@ 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 shared libs and dynamic linking on secondary archs -%ifarch armv7hl -cat >> %{buildroot}/%{macros_dir}/macros.ghc < - 1.4.8-1 +- drop cabal_tests_not_working since not all tests failing on ARMv7 + * Sat Jan 31 2015 Jens Petersen - 1.4.7-1 - fix arch for cabal_tests_not_working - add cabal_test macro which uses it diff --git a/macros.ghc b/macros.ghc index 5cbacf8..7bf522c 100644 --- a/macros.ghc +++ b/macros.ghc @@ -23,17 +23,15 @@ fi %ghc_check_bootstrap\ CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{!?cabal_tests_not_working:%{?with_tests:--enable-tests}} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options +%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options # install %cabal_install %cabal copy --destdir=%{buildroot} -v tests %cabal_test\ -%if %{undefined cabal_tests_not_working}\ %if %{with tests}\ %cabal test\ -%endif\ %endif # root dir for ghc docs (used by ghc.spec)