Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For Ubuntu >= 13.04 install lib32stdc++6 package #1

Merged
merged 1 commit into from
Oct 21, 2013
Merged

For Ubuntu >= 13.04 install lib32stdc++6 package #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,21 @@
#
# Install required libraries
#
if (node['platform'] == 'ubuntu')
if node['platform'] == 'ubuntu'
package 'libgl1-mesa-dev'
end

#
# Install required 32-bit libraries on 64-bit platforms
#
if (node['os'] == 'linux' && node['kernel']['machine'] != 'i686')
if (node['platform'] == 'ubuntu')
#TODO should check it is an ubuntu 11.10+
package 'libstdc++6:i386'
#
# Install required 32-bit libraries on 64-bit platforms
#
if node['kernel']['machine'] != 'i686'
# http://askubuntu.com/questions/147400/problems-with-eclipse-and-android-sdk
if Chef::VersionConstraint.new(">= 13.04").include?(node['platform_version'])
package 'lib32stdc++6'
elsif Chef::VersionConstraint.new(">= 11.10").include?(node['platform_version'])
package 'libstdc++6:i386'
end

package 'lib32z1'
else
Chef::Application.fatal!("This 'Android SDK' cookbook currently only supports ubuntu 64-bit and other linux 32-bit platforms, but this node is a #{node['platform']}/#{node['kernel']['machine']} box.")
end
end

Expand Down