Commit 0c4149d7 authored by Andrew Gibiansky's avatar Andrew Gibiansky

Attempting to fix build issues for travis

parent 30da2751
...@@ -13,6 +13,7 @@ before_install: ...@@ -13,6 +13,7 @@ before_install:
- travis_retry sudo add-apt-repository -y ppa:hvr/ghc - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
- travis_retry sudo apt-get update - travis_retry sudo apt-get update
- travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER # see note about happy/alex - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER # see note about happy/alex
- travis_retry sudo apt-get install libmagic-dev
- travis_retry git clone http://www.github.com/zeromq/zeromq4-x.git libzmq - travis_retry git clone http://www.github.com/zeromq/zeromq4-x.git libzmq
- export OLDPWD=$(pwd) && cd libzmq && travis_retry ./autogen.sh && travis_retry ./configure && make && travis_retry sudo make install && travis_retry sudo ldconfig && cd $OLDPWD - export OLDPWD=$(pwd) && cd libzmq && travis_retry ./autogen.sh && travis_retry ./configure && make && travis_retry sudo make install && travis_retry sudo ldconfig && cd $OLDPWD
- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
...@@ -29,11 +30,12 @@ install: ...@@ -29,11 +30,12 @@ install:
- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- travis_retry cabal update - travis_retry cabal update
- travis_retry cabal install cpphs - travis_retry cabal install cpphs
- travis_retry cabal install gtk2hs-buildtools
# Here starts the actual work to be performed for the package under test; any command which exits with a non-zero exit code causes the build to fail. # Here starts the actual work to be performed for the package under test; any command which exits with a non-zero exit code causes the build to fail.
script: script:
- ./build.sh all - travis_retry ./build.sh all
- ./build.sh display - travis_retry ./build.sh display
- cabal sdist - cabal sdist
# The following scriptlet checks that the resulting source distribution can be built & installed # The following scriptlet checks that the resulting source distribution can be built & installed
......
...@@ -90,8 +90,10 @@ pprDynFlags show_all dflags = ...@@ -90,8 +90,10 @@ pprDynFlags show_all dflags =
vcat [ vcat [
text "GHCi-specific dynamic flag settings:" $$ text "GHCi-specific dynamic flag settings:" $$
nest 2 (vcat (map (setting gopt) ghciFlags)), nest 2 (vcat (map (setting gopt) ghciFlags)),
#if MIN_VERSION_ghc(7,8,0)
text "other dynamic, non-language, flag settings:" $$ text "other dynamic, non-language, flag settings:" $$
nest 2 (vcat (map (setting gopt) others)), nest 2 (vcat (map (setting gopt) others)),
#endif
text "warning settings:" $$ text "warning settings:" $$
nest 2 (vcat (map (setting wopt) DynFlags.fWarningFlags)) nest 2 (vcat (map (setting wopt) DynFlags.fWarningFlags))
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment