From 755a88574d18ed53f1c58e4f372cfa434c4b3dbf Mon Sep 17 00:00:00 2001 From: Nikolai Vavilov <vvnicholas@gmail.com> Date: Sun, 16 Jul 2017 23:56:39 +0300 Subject: [PATCH] ansible: use gcc 4.9 on Ubuntu 14.04 --- ansible/roles/baselayout/tasks/main.yml | 17 ++++++++--------- .../tasks/partials/repo/ubuntu1404.yml | 13 +++++++++++++ ansible/roles/baselayout/vars/main.yml | 2 ++ 3 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 ansible/roles/baselayout/tasks/partials/repo/ubuntu1404.yml diff --git a/ansible/roles/baselayout/tasks/main.yml b/ansible/roles/baselayout/tasks/main.yml index 0a207272b..fd7f0bb59 100644 --- a/ansible/roles/baselayout/tasks/main.yml +++ b/ansible/roles/baselayout/tasks/main.yml @@ -59,15 +59,14 @@ - "{{ packages[os|stripversion]|default('[]') }}" - "{{ common_packages|default('[]') }}" -#- name: update package alteratives -# when: os == debian7 -# alterantives: -# loop_control: -# loop_var: gcc -# with_items: -# - gcc -# - g++ -# - cc +- name: update package alternatives + when: os == "ubuntu1404" + alternatives: link=/usr/bin/{{ gcc }} name={{ gcc }} path=/usr/bin/{{ gcc }}-4.9 + loop_control: + loop_var: gcc + with_items: + - gcc + - g++ - name: remove fortune from login shells when: os|stripversion == 'freebsd' diff --git a/ansible/roles/baselayout/tasks/partials/repo/ubuntu1404.yml b/ansible/roles/baselayout/tasks/partials/repo/ubuntu1404.yml new file mode 100644 index 000000000..6efa00c98 --- /dev/null +++ b/ansible/roles/baselayout/tasks/partials/repo/ubuntu1404.yml @@ -0,0 +1,13 @@ +--- + +# +# add PPA for gcc 4.9 +# + + +- name: "repo : add Ubuntu Toolchain PPA" + apt_repository: + repo: 'ppa:ubuntu-toolchain-r/test' + state: present + update_cache: yes + register: has_updated_package_repo diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index 43699a828..02893874d 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -115,5 +115,7 @@ packages: { ubuntu1404: [ 'ntp', + 'g++-4.9', + 'gcc-4.9', ] }