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

Author: caseywilliams

configs/components/_base-ruby.rb

@@ -70,11 +70,6 @@
 elsif platform.is_solaris?
   pkg.build_requires "runtime-#{settings[:runtime_project]}"
   pkg.build_requires 'libedit'
-  if platform.architecture == 'sparc'
-    if platform.os_version == '11'
-      pkg.build_requires 'pl-ruby'
-    end
-  end
 elsif platform.is_cross_compiled_linux?
   pkg.build_requires "runtime-#{settings[:runtime_project]}"
   pkg.build_requires 'pl-ruby'

configs/components/augeas.rb

@@ -90,7 +90,6 @@
       pkg.environment "PKG_CONFIG_PATH", "/opt/csw/lib/pkgconfig"
       pkg.environment "PKG_CONFIG", "/opt/csw/bin/pkg-config"
     else
-      pkg.build_requires 'pl-pkg-config'
       pkg.environment "PKG_CONFIG_PATH", "/usr/lib/pkgconfig"
       pkg.environment "PKG_CONFIG", "/opt/pl-build-tools/bin/pkg-config"
     end

configs/components/libxslt.rb

@@ -38,7 +38,7 @@
     pkg.environment "CFLAGS" => settings[:cflags]
   end
 
-  if platform.is_cross_compiled_linux? || platform.name =~ /solaris-11/
+  if platform.is_cross_compiled_linux?
     pkg.build_requires "pl-gcc-#{platform.architecture}" unless platform.is_deb?
   end
 

configs/components/openssl-1.1.0.rb

@@ -41,7 +41,6 @@
     cflags = '$${CFLAGS} -static-libgcc'
     target = 'aix-gcc'
   elsif platform.is_solaris?
-
     pkg.environment 'PATH', '/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin'
     pkg.environment 'CC', "/opt/pl-build-tools/bin/#{settings[:platform_triple]}-gcc"
 

configs/components/yaml-cpp.rb

@@ -3,20 +3,12 @@
   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?
+  if platform.is_aix? || platform.is_el? || platform.is_sles? || platform.is_fedora? || platform.is_deb? || platform.is_solaris?
   # Moved to platform def, do nothing
   elsif platform.is_cross_compiled_linux?
     pkg.build_requires "pl-binutils-#{platform.architecture}"
     pkg.build_requires "pl-gcc-#{platform.architecture}"
     pkg.build_requires "pl-cmake"
-  elsif platform.is_solaris?
-    if platform.os_version == "10"
-      pkg.build_requires "http://pl-build-tools.delivery.puppetlabs.net/solaris/10/pl-cmake-3.2.3-15.i386.pkg.gz"
-    elsif platform.os_version == "11"
-      pkg.build_requires "pl-binutils-#{platform.architecture}"
-      pkg.build_requires "pl-gcc-#{platform.architecture}"
-      pkg.build_requires "pl-cmake"
-    end
   elsif platform.is_windows?
     pkg.build_requires "pl-toolchain-#{platform.architecture}"
     pkg.build_requires "cmake"

configs/platforms/solaris-10-i386.rb

@@ -7,6 +7,13 @@
   base_pkgs = ['arc', 'gnu-idn', 'gpch', 'gtar', 'hea', 'libm', 'wgetu', 'xcu4']
   base_url = 'http://pl-build-tools.delivery.puppetlabs.net/solaris/10/depends'
 
+  build_pkgs = [
+    "pl-binutils-2.27-1.i386.pkg.gz",
+    "pl-cmake-3.2.3-15.i386.pkg.gz",
+    "pl-gcc-4.8.2-1.i386.pkg.gz"
+  ]
+  build_url = "http://pl-build-tools.delivery.puppetlabs.net/solaris/10"
+
   plat.provision_with %[echo "# Write the noask file to a temporary directory
 # please see man -s 4 admin for details about this file:
 # http://www.opensolarisforum.org/man/man4/admin.html
@@ -49,6 +56,12 @@
   for pkg in #{base_pkgs.map { |pkg| "SUNW#{pkg}.pkg.gz" }.join(' ')}; do \
   tmpdir=$(mktemp -p /var/tmp -d); (cd ${tmpdir} && curl -O #{base_url}/${pkg} && gunzip -c ${pkg} | pkgadd -d /dev/stdin -a /var/tmp/vanagon-noask all); \
   done
+
+  # Install component build dependencies
+  for pkg in #{build_pkgs.join(' ')}; do \
+  tmpdir=$(mktemp -p /var/tmp -d); (cd ${tmpdir} && curl -O #{build_url}/${pkg} && gunzip -c ${pkg} | pkgadd -d /dev/stdin -a /var/tmp/vanagon-noask all); \
+  done
+
   ntpdate pool.ntp.org]
 
   plat.output_dir File.join("solaris", "10", "PC1")

configs/platforms/solaris-10-sparc.rb

@@ -11,6 +11,13 @@
   base_pkgs = ['arc', 'gnu-idn', 'gpch', 'gtar', 'hea', 'libm', 'wgetu', 'xcu4']
   base_url = 'http://pl-build-tools.delivery.puppetlabs.net/solaris/10/depends'
 
+  build_pkgs = [
+    "pl-binutils-2.27-2.sparc.pkg.gz",
+    "pl-cmake-3.2.3-15.i386.pkg.gz",
+    "pl-gcc-4.8.2-9.sparc.pkg.gz"
+  ]
+  build_url = "http://pl-build-tools.delivery.puppetlabs.net/solaris/10"
+
   plat.provision_with %[echo "# Write the noask file to a temporary directory
 # please see man -s 4 admin for details about this file:
 # http://www.opensolarisforum.org/man/man4/admin.html
@@ -53,6 +60,12 @@
   for pkg in #{base_pkgs.map { |pkg| "SUNW#{pkg}.pkg.gz" }.join(' ')}; do \
   tmpdir=$(mktemp -p /var/tmp -d); (cd ${tmpdir} && curl -O #{base_url}/${pkg} && gunzip -c ${pkg} | pkgadd -d /dev/stdin -a /var/tmp/vanagon-noask all); \
   done
+
+  # Install component build dependencies
+  for pkg in #{build_pkgs.join(' ')}; do \
+  tmpdir=$(mktemp -p /var/tmp -d); (cd ${tmpdir} && curl -O #{build_url}/${pkg} && gunzip -c ${pkg} | pkgadd -d /dev/stdin -a /var/tmp/vanagon-noask all); \
+  done
+
   ntpdate pool.ntp.org]
 
   plat.output_dir File.join("solaris", "10", "PC1")

configs/platforms/solaris-11-i386.rb

@@ -4,6 +4,16 @@
   plat.servicetype "smf"
   plat.vmpooler_template "solaris-11-x86_64"
   plat.add_build_repository 'http://solaris-11-reposync.delivery.puppetlabs.net:81', 'puppetlabs.com'
+
+  packages = [
+    "pl-binutils-i386",
+    "pl-cmake",
+    "pl-gcc-i386",
+    "pl-pkg-config"
+  ]
+
+  plat.provision_with("pkg install #{packages.join(' ')}")
+
   plat.install_build_dependencies_with "pkg install ", " || [[ $? -eq 4 ]]"
   plat.output_dir File.join("solaris", "11", "PC1")
 end

configs/platforms/solaris-11-sparc.rb

@@ -5,6 +5,17 @@
   plat.cross_compiled true
   plat.vmpooler_template "solaris-11-x86_64"
   plat.add_build_repository 'http://solaris-11-reposync.delivery.puppetlabs.net:81', 'puppetlabs.com'
+
+  packages = [
+    "pl-binutils-sparc",
+    "pl-cmake",
+    "pl-gcc-sparc",
+    "pl-pkg-config",
+    "pl-ruby"
+  ]
+
+  plat.provision_with("pkg install #{packages.join(' ')}")
+
   plat.install_build_dependencies_with "pkg install ", " || [[ $? -eq 4 ]]"
   plat.output_dir File.join("solaris", "11", "PC1")
 end