rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

%cabal_tests_not_working fixes: add %cabal_test

Browse Source 
correct the arch
This commit is contained in:
Jens Petersen 2015-01-31 20:22:21 +00:00
parent 9460154623
commit efcc8cce75
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ghc-rpm-macros.spec
View File

@ -6,7 +6,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.4.6 Version: 1.4.7
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building packages for GHC Summary: RPM macros for building packages for GHC
@ -73,7 +73,7 @@ install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver
install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag
# turn off shared libs and dynamic linking on secondary archs # turn off shared libs and dynamic linking on secondary archs
%ifarch archv7hl %ifarch armv7hl
cat >> %{buildroot}/%{macros_dir}/macros.ghc <<EOF cat >> %{buildroot}/%{macros_dir}/macros.ghc <<EOF
# tests failing on arm # tests failing on arm
@ -98,6 +98,10 @@ EOF
%changelog %changelog
* Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.7-1
- fix arch for cabal_tests_not_working
- add cabal_test macro which uses it
* Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.6-1 * Sat Jan 31 2015 Jens Petersen <petersen@redhat.com> - 1.4.6-1
- disable Cabal tests on armv7 since they give an internal error - disable Cabal tests on armv7 since they give an internal error
https://ghc.haskell.org/trac/ghc/ticket/10029 https://ghc.haskell.org/trac/ghc/ticket/10029

8
macros.ghc
View File

@ -28,6 +28,14 @@ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\
# install # install
%cabal_install %cabal copy --destdir=%{buildroot} -v %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) # root dir for ghc docs (used by ghc.spec)
%ghc_html_dir %{_docdir}/ghc/html %ghc_html_dir %{_docdir}/ghc/html
# deprecates # deprecates