summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@digia.com>2013-04-05 13:37:47 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-05 13:15:17 +0200
commitdef0973d45122e3ec34ef2975c306cc008b6f479 (patch)
tree822bfc63896c9fc21791f016450983d9390c17c6
parentf746d5c7bc7b61ef38f65a1b25841474378a6fb5 (diff)
Libraries for Android's tests
These libraries are required for android config tests. This will install them for Ubuntu 12.04 nodes Change-Id: I4e92d64c20b0259437098410f7ca78e6ba228aaa Reviewed-by: Simo Fรคlt <simo.falt@digia.com>
-rw-r--r--puppet/modules/qt_prereqs/manifests/linux.pp9
1 files changed, 9 insertions, 0 deletions
diff --git a/puppet/modules/qt_prereqs/manifests/linux.pp b/puppet/modules/qt_prereqs/manifests/linux.pp
index 851b9a3..1d6a340 100644
--- a/puppet/modules/qt_prereqs/manifests/linux.pp
+++ b/puppet/modules/qt_prereqs/manifests/linux.pp
@@ -62,6 +62,15 @@ class qt_prereqs::linux inherits qt_prereqs::unix {
}
}
+ if $::lsbmajdistrelease == 12 {
+ package {
+ # for android's tests
+ "lib32ncurses5": ensure => installed;
+ "lib32stdc++6": ensure => installed;
+ }
+ }
+
+
package {
"libgl1-mesa-dev": ensure => installed;
"libxrender-dev": ensure => installed;