Fixeth shit for 64 bit

travis-ci · Aug 19, 2012 · da7720e · da7720e
1 parent 9e7a9cd
commit da7720e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/ci_environment/clang/recipes/tarball.rb b/ci_environment/clang/recipes/tarball.rb
@@ -23,9 +23,9 @@
 
 arch = case node.clang.version
        when "3.1" then
-         "x86"
+         kernel['machine'] =~ /x86_64/ ? "x86_64" : "x86"
        else
-         "i386"
+         kernel['machine'] =~ /x86_64/ ? "x86_64" : "i386"
        end
 
 platform_name, ext = case [node[:platform], node[:platform_version]]

diff --git a/ci_environment/haskell/attributes/ghc.rb b/ci_environment/haskell/attributes/ghc.rb
@@ -1,4 +1,4 @@
 default[:ghc] = {
   :version => "7.4.1",
-  :arch    => kernel['machine'] =~ /x86_64/ ? "amd64" : "i386"
+  :arch    => kernel['machine'] =~ /x86_64/ ? "x86_64" : "i386"
 }
diff --git a/ci_environment/haskell/recipes/ghc_source.rb b/ci_environment/haskell/recipes/ghc_source.rb
@@ -37,7 +37,7 @@
 require "tmpdir"
 
 td            = Dir.tmpdir
-local_tarball = File.join(td, "ghc-#{node.ghc.version}-i386-unknown-linux.tar.bz2")
+local_tarball = File.join(td, "ghc-#{node.ghc.version}-#{node.ghc.arch}-unknown-linux.tar.bz2")
 
 remote_file(local_tarball) do
   source "http://www.haskell.org/ghc/dist/#{node.ghc.version}/ghc-#{node.ghc.version}-#{node.ghc.arch}-unknown-linux.tar.bz2"

diff --git a/ci_environment/phpbuild/recipes/default.rb b/ci_environment/phpbuild/recipes/default.rb
@@ -33,19 +33,21 @@
 include_recipe "libxml"
 include_recipe "libssl"
 
+arch = kernel['machine'] =~ /x86_64/ ? "x86_64" : "i386"
+
 case node[:platform]
 when "ubuntu", "debian"
   %w{libbz2-dev libc-client2007e-dev libcurl4-gnutls-dev libfreetype6-dev libgmp3-dev libjpeg8-dev libmcrypt-dev libpng12-dev libt1-dev libmhash-dev libexpat1-dev libicu-dev libtidy-dev re2c lemon}.each do |pkg|
     package(pkg) { action :install }
   end
 
   link "/usr/lib/libpng.so" do
-    to "/usr/lib/#{node.travis_build_environment.arch}-linux-gnu/libpng.so"
+    to "/usr/lib/#{arch}-linux-gnu/libpng.so"
   end
 
   if node[:platform_version].to_f >= 12.04
     link "/usr/lib/libmysqlclient.so" do
-      to "/usr/lib/#{node.travis_build_environment.arch}-linux-gnu/libmysqlclient.so"
+      to "/usr/lib/#{arch}-linux-gnu/libmysqlclient.so"
     end
   end
 
@@ -57,11 +59,11 @@
     # on 11.10, we also have to symlink libjpeg and a bunch of other libraries
     # because of the 32-bit/64-bit library directory separation. MK.
     link "/usr/lib/libjpeg.so" do
-      to "/usr/lib/#{node.travis_build_environment.arch}-linux-gnu/libjpeg.so"
+      to "/usr/lib/#{arch}-linux-gnu/libjpeg.so"
     end
 
     link "/usr/lib/libstdc++.so.6" do
-      to "/usr/lib/#{node.travis_build_environment.arch}-linux-gnu//usr/lib/libstdc++.so.6"
+      to "/usr/lib/#{arch}-linux-gnu//usr/lib/libstdc++.so.6"
     end
   end
 end