(PA-2024) Move macOS build requirements to platform files

Author: caseywilliams

configs/components/openssl-1.1.0.rb

@@ -78,15 +78,6 @@
     pkg.build_requires 'imake' if platform.name =~ /^el/
     pkg.build_requires 'xorg-x11-util-devel' if platform.name =~ /^sles/
     pkg.build_requires 'xutils-dev' if platform.is_deb?
-  elsif platform.is_macos?
-    pkg.build_requires 'makedepend'
-    if platform.name =~ /debian-8-arm/
-      unless platform.is_fedora? && platform.os_version.delete('f').to_i >= 26
-        # TODO: pdk had this for all linux platforms, but agent didn't - necessary?
-        pkg.build_requires 'pl-binutils'
-      end
-    pkg.build_requires 'pl-gcc'
-    end
   end
 
   ###########

configs/components/yaml-cpp.rb

@@ -3,7 +3,7 @@
   pkg.ref "refs/tags/yaml-cpp-0.6.2"
 
   # Build Requirements
-  if platform.is_aix? || platform.is_el? || platform.is_sles? || platform.is_fedora? || platform.is_deb? || platform.is_solaris?
+  if platform.is_aix? || platform.is_el? || platform.is_sles? || platform.is_fedora? || platform.is_deb? || platform.is_solaris? || platform.is_macos?
   # Moved to platform def, do nothing
   elsif platform.is_cross_compiled_linux?
     pkg.build_requires "pl-binutils-#{platform.architecture}"
@@ -12,8 +12,6 @@
   elsif platform.is_windows?
     pkg.build_requires "pl-toolchain-#{platform.architecture}"
     pkg.build_requires "cmake"
-  elsif platform.is_macos?
-    pkg.build_requires "cmake"
   else
     pkg.build_requires "pl-gcc"
     pkg.build_requires "make"

configs/platforms/osx-10.10-x86_64.rb

@@ -8,6 +8,15 @@
   plat.provision_with '/usr/local/bin/brew tap-pin puppetlabs/brew-build-tools'
   plat.provision_with 'curl -o /usr/local/bin/osx-deps http://pl-build-tools.delivery.puppetlabs.net/osx/osx-deps; chmod 755 /usr/local/bin/osx-deps'
   plat.provision_with '/usr/local/bin/osx-deps apple-clt-7.2 pkg-config'
+
+  packages = [
+    "cmake",
+    "makedepend",
+    "pl-gcc"
+  ]
+
+  plat.provision_with "/usr/local/bin/osx-deps #{packages.join(' ')}}"
+
   plat.install_build_dependencies_with "/usr/local/bin/osx-deps "
   plat.vmpooler_template "osx-1010-x86_64"
   plat.output_dir File.join("apple", "10.10", "PC1", "x86_64")

configs/platforms/osx-10.11-x86_64.rb

@@ -8,6 +8,15 @@
   plat.provision_with '/usr/local/bin/brew tap-pin puppetlabs/brew-build-tools'
   plat.provision_with 'curl -o /usr/local/bin/osx-deps http://pl-build-tools.delivery.puppetlabs.net/osx/osx-deps; chmod 755 /usr/local/bin/osx-deps'
   plat.provision_with '/usr/local/bin/osx-deps apple-clt-7.3.1 pkg-config'
+
+  packages = [
+    "cmake",
+    "makedepend",
+    "pl-gcc"
+  ]
+
+  plat.provision_with "/usr/local/bin/osx-deps #{packages.join(' ')}}"
+
   plat.install_build_dependencies_with "/usr/local/bin/osx-deps "
   plat.vmpooler_template "osx-1011-x86_64"
   plat.output_dir File.join("apple", "10.11", "PC1", "x86_64")

configs/platforms/osx-10.12-x86_64.rb

@@ -13,6 +13,15 @@
   plat.provision_with '/usr/local/bin/brew tap-pin puppetlabs/brew-build-tools'
   plat.provision_with 'curl -o /usr/local/bin/osx-deps http://pl-build-tools.delivery.puppetlabs.net/osx/osx-deps; chmod 755 /usr/local/bin/osx-deps'
   plat.provision_with '/usr/local/bin/osx-deps pkg-config'
+
+  packages = [
+    "cmake",
+    "makedepend",
+    "pl-gcc"
+  ]
+
+  plat.provision_with "/usr/local/bin/osx-deps #{packages.join(' ')}}"
+
   plat.install_build_dependencies_with "/usr/local/bin/osx-deps "
   plat.vmpooler_template "osx-1012-x86_64"
   plat.output_dir File.join("apple", "10.12", "PC1", "x86_64")

configs/platforms/osx-10.13-x86_64.rb

@@ -13,6 +13,15 @@
   plat.provision_with '/usr/local/bin/brew tap-pin puppetlabs/brew-build-tools'
   plat.provision_with 'curl -o /usr/local/bin/osx-deps http://pl-build-tools.delivery.puppetlabs.net/osx/osx-deps; chmod 755 /usr/local/bin/osx-deps'
   plat.provision_with '/usr/local/bin/osx-deps pkg-config'
+
+  packages = [
+    "cmake",
+    "makedepend",
+    "pl-gcc"
+  ]
+
+  plat.provision_with "/usr/local/bin/osx-deps #{packages.join(' ')}}"
+
   plat.install_build_dependencies_with "/usr/local/bin/osx-deps "
   plat.vmpooler_template "osx-1012-x86_64"
   plat.output_dir File.join("apple", "10.13", "PC1", "x86_64")