UnixPB: Make changes so FreeBSD works (#1077)

adoptium · Jan 6, 2020 · 9d87de3 · 9d87de3
1 parent e2188bc
commit 9d87de3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 27 deletions.
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/FreeBSD.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/FreeBSD.yml
@@ -7,47 +7,27 @@
 Build_Tool_Packages:
   - alsa-lib
   - autoconf
-  - automake
   - bash
-  - binutils
-  - bison
   - cups
-  - curl
   - fontconfig
   - freetype2
-  - gcc
-  - gcc-ecj
+  - giflib
   - git
   - gmake
-  - libICE
-  - libSM
-  - libX11
-  - libXau
-  - libXdmcp
+  - jpeg-turbo
+  - lcms2
   - libXext
-  - libXfixes
   - libXi
+  - libX11
   - libXrandr # JDK12+ compilation
   - libXrender
   - libXt
   - libXtst
-  - libdaemon
-  - libffi
-  - libfontenc
-  - libgnomecups
-  - libiconv
-  - libxcb
-  - m4
-  - mercurial
-  - mkfontdir
-  - nano
   - openjdk
   - openjdk8
-  - ntp
-  - gtar
-  - xextproto
-  - xproto
-  - wget
+  - pkgconf
+  - png
+  - unzip
   - zip
 
 gcc_compiler:

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/ccache/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/ccache/tasks/main.yml
@@ -27,13 +27,22 @@
   when:
     - ccache_status.stat.isdir is not defined
     - ansible_architecture != "s390x"
+    - ansible_distribution != "FreeBSD"
   tags: ccache
 
 - name: Running ./configure & make for CCACHE for s390x
   shell: cd /tmp/ccache-3.4.2 && ./configure && make -j {{ ansible_processor_cores }} && make install
   when:
     - ccache_status.stat.isdir is not defined
     - ansible_architecture == "s390x"
+    - ansible_distribution != "FreeBSD"
+  tags: ccache
+
+- name: Running ./configure & make for CCACHE for FreeBSD
+  shell: cd /tmp/ccache-3.4.2 && ./configure && make -j {{ ansible_processor_cores }} && gmake install
+  when:
+    - ccache_status.stat.isdir is not defined
+    - ansible_distribution == "FreeBSD"
   tags: ccache
 
 - name: Remove downloaded packages for ccache