Permalink
Browse files

move zlib install to after update

  • Loading branch information...
1 parent 3d724ec commit 0d29a7a2c345ff88909e5d153213536bc532f13e @mwotton committed Jan 5, 2013
Showing with 2 additions and 3 deletions.
  1. +0 −1 .travis.yml
  2. +2 −2 Rakefile
View
1 .travis.yml
@@ -4,7 +4,6 @@ rvm:
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq ghc ghc-dynamic cabal-install zlib1g-dev
- - cabal install zlib --enable-shared
before_script:
- bundle exec rake
script:
View
4 Rakefile
@@ -1,5 +1,5 @@
-
+include Rake::DSL
require 'bundler'
Bundler::GemHelper.install_tasks
require 'rake'
@@ -34,7 +34,7 @@ extraIncludeDirs = [\"#{headers}\", \"#{arch_headers}\"]"
# command="cd Haskell; cabal update; cabal install
# --extra-include-dirs=#{RbConfig::CONFIG['rubyhdrdir']}
# --extra-include-dirs=#{RbConfig::CONFIG['rubyhdrdir']}/#{RbConfig::CONFIG['arch']} --extra-lib-dirs=#{RbConfig::CONFIG['libdir']} --user --enable-shared --with-ghc=#{ghc_version}"
- command="cabal update; cd Haskell; cabal install --extra-include-dirs=#{arch_headers} --extra-include-dirs=#{headers} --extra-lib-dirs=#{lib_dir} --user --enable-shared --with-ghc=#{ghc_version} --verbose --disable-library-profiling"
+ command="cabal update; cabal install zlib --enable-shared; cd Haskell; cabal install --extra-include-dirs=#{arch_headers} --extra-include-dirs=#{headers} --extra-lib-dirs=#{lib_dir} --user --enable-shared --with-ghc=#{ghc_version} --verbose --disable-library-profiling"
puts "running #{command}"
result=%x{#{command}}
end

0 comments on commit 0d29a7a

Please sign in to comment.