add ccache for macos

Author: George Adams

ansible/roles/baselayout/tasks/main.yml

@@ -84,6 +84,20 @@
     - "{{ packages[os|stripversion]|default('[]') }}"
     - "{{ common_packages|default('[]') }}"
 
+- name: Check whether /etc/paths contains "/usr/localopt/ccache/libexec" (macos)
+  when: os|startswith("macos")
+  command: grep -Fxq "/usr/localopt/ccache/libexec" /etc/paths
+  register: ccache_mac
+  check_mode: no
+  ignore_errors: yes
+  changed_when: no
+
+- name: add ccache to the path (macos)
+  when: ccache_mac.rc == 1
+  lineinfile: dest=/etc/paths
+    insertbefore=BOF
+    line='/usr/localopt/ccache/libexec'
+
 - name: ubuntu1404 | update package alternatives
   when: os == "ubuntu1404"
   alternatives: link=/usr/bin/{{ gcc }} name={{ gcc }} path=/usr/bin/{{ gcc }}-4.9

ansible/roles/baselayout/vars/main.yml

@@ -27,111 +27,46 @@ ntp_service: {
 }
 
 common_packages: [
-<<<<<<< HEAD
-  'automake,bash,libtool,sudo',
-=======
-  'automake',
-  'bash',
-  'libtool',
->>>>>>> Initial macOS ansible scripts
+  'automake,bash,libtool',
 ]
 
 # you can either add os family or os to this list (see smartos)
 # but the playbook chooses os over family - not both
 packages: {
-<<<<<<< HEAD
   centos6_x64: ['centos-release-scl'], # only available on x86_64, 32-bit is from https://copr.fedorainfracloud.org/coprs/mlampe
   centos6: [
-    'ccache,git2u,gcc-c++,devtoolset-6', # even need gcc on centos6 so ccache has symlinks
-=======
-  alpine: [
-    'autoconf',
-    'ccache',
-    'g++',
-    'gcc',
-    'git',
-    'linux-headers',
-    'm4',
-    'make',
-    'procps',
-    'xz',
-    'sudo',
-  ],
-
-  centos: [
-    'ccache',
-    'git',
-    'sudo',
->>>>>>> Initial macOS ansible scripts
+    'ccache,git2u,gcc-c++,devtoolset-6,sudo', # even need gcc on centos6 so ccache has symlinks
   ],
 
   centos7_arm64: ['git'], # git2u not available for aarch64 (yet)
-  centos7_x64: ['git2u','centos-release-scl'], # centos-release-scl is required to enable SCLo
+  centos7_x64: ['git2u','centos-release-scl',], # centos-release-scl is required to enable SCLo
                                                # but we do it manually in partials/repo/centos7.yml for arm64
   centos7: [
-<<<<<<< HEAD
-    'ccache,gcc-c++,devtoolset-6',
+    'ccache,gcc-c++,devtoolset-6,sudo',
   ],
 
   debian7: [
-    'gcc-4.8,g++-4.8',
+    'gcc-4.8,g++-4.8,sudo',
   ],
 
   debian8: [
-    'ccache,git,gcc-4.9,g++-4.9,libfontconfig1',
+    'ccache,git,gcc-4.9,g++-4.9,libfontconfig1,sudo',
   ],
 
   debian9: [
-    'gcc-6,g++-6,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates',
+    'gcc-6,g++-6,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo',
   ],
 
   fedora: [
-    'bzip2,ccache,gcc-c++,git,fontconfig',
+    'bzip2,ccache,gcc-c++,git,fontconfig,sudo',
   ],
 
   freebsd: [
-    'ccache,git,gmake'
-=======
-    'gcc-c++',
-    'sudo',
-  ],
-
-  debian7: [
-    'gcc-4.8',
-    'g++-4.8',
-    'sudo',
-  ],
-
-  debian8: [
-    'ccache',
-    'git',
-    'libfontconfig1',
-    'sudo',
-  ],
-
-  fedora: [
-    'ccache',
-    'gcc-c++',
-    'git',
-    'fontconfig',
-    'sudo',
-  ],
-
-  freebsd: [
-    'ccache',
-    'git',
-    'gmake',
-    'sudo',
-  ],
-
-  macos: [
-    'curl',
-    'python2',
->>>>>>> Initial macOS ansible scripts
+    'ccache,git,gmake,sudo'
   ],
 
   rhel72: [
-    'gcc-c++',
+    'gcc-c++,sudo',
   ],
 
   smartos: [
@@ -149,21 +84,11 @@ packages: {
 
   smartos15: [
     'gcc49',
-<<<<<<< HEAD
     'gcc49-libs'
-=======
-    'gcc49-libs',
-    'gccmakedep',
-    'git',
-    'gmake',
-    'xz',
-    'sudo',
->>>>>>> Initial macOS ansible scripts
   ],
 
   smartos16: [
     'gcc49',
-<<<<<<< HEAD
     'gcc49-libs'
   ],
 
@@ -172,24 +97,7 @@ packages: {
   ],
 
   ubuntu: [
-    'ccache,g++,gcc,git,libfontconfig1',
-=======
-    'gcc49-libs',
-    'gccmakedep',
-    'git',
-    'gmake',
-    'xz',
-    'sudo',
-  ],
-
-  ubuntu: [
-    'ccache',
-    'g++',
-    'gcc',
-    'git',
-    'libfontconfig1',
-    'sudo',
->>>>>>> Initial macOS ansible scripts
+    'ccache,g++,gcc,git,libfontconfig1,sudo',
   ],
 
   ubuntu1404: [