diff options
| author | Heikki Halmet <heikki.halmet@digia.com> | 2013-09-19 14:48:48 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 14:33:49 +0200 |
| commit | 75fe6c6d9d16e29b7947e7a4b309624c5421338c (patch) | |
| tree | af8cc14b59650103af197cdbaff491bd7b6a22a4 | |
| parent | caa82f5e6dc80b00eb86194cd52e339eccfac76c (diff) | |
Install libicu-dev and libxcb-icccm4-dev only to ci ubuntus
Dev packages causes wrong dependences into system libraries when making
releases.
Change-Id: I48c5963df38d18884b8e6385db4cfb08d15013a4
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Tony SarajΓ€rvi <tony.sarajarvi@digia.com>
| -rw-r--r-- | puppet/modules/qt_prereqs/manifests/linux.pp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/puppet/modules/qt_prereqs/manifests/linux.pp b/puppet/modules/qt_prereqs/manifests/linux.pp index f5d910c..a17ea25 100644 --- a/puppet/modules/qt_prereqs/manifests/linux.pp +++ b/puppet/modules/qt_prereqs/manifests/linux.pp @@ -36,10 +36,20 @@ class qt_prereqs::linux inherits qt_prereqs::unix { } if $::operatingsystem == "Ubuntu" { - - $libxcb_icccm_dev = $::lsbmajdistrelease ? { - 10 => "libxcb-icccm1-dev", - default => "libxcb-icccm4-dev", + if $location == "Digia" { + if $::domain == "ci.local" { + $libxcb_icccm_dev = $::lsbmajdistrelease ? { + 10 => "libxcb-icccm1-dev", + default => "libxcb-icccm4-dev", + } + + package { + "$libxcb_icccm_dev": ensure => installed; + + # optional dependency for QLocale + "libicu-dev": ensure => installed; + } + } } if $::lsbmajdistrelease >= 11 { @@ -83,7 +93,6 @@ class qt_prereqs::linux inherits qt_prereqs::unix { # for xcb qpa backend: "libx11-xcb-dev": ensure => installed; "libxcb-glx0-dev": ensure => installed; - "$libxcb_icccm_dev": ensure => installed; "libxcb-image0-dev": ensure => installed; "libxcb-keysyms1-dev": ensure => installed; "libxcb-shm0-dev": ensure => installed; @@ -124,9 +133,6 @@ class qt_prereqs::linux inherits qt_prereqs::unix { # needed by some client tool "libbz2-dev": ensure => installed; "libedit-dev": ensure => installed; - - # optional dependency for QLocale - "libicu-dev": ensure => installed; } } |