(PA-4872) OpenSSL 3 work for Solaris-11-x86-64

This PR continues Aria's work for getting Solaris 11 x86-64 building openssl 3. This uses OpenCSW's GCC to build openssl.
puppetlabs · Jun 30, 2023 · 52bfb2b · 52bfb2b
1 parent 9d535a1
commit 52bfb2b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/configs/components/libffi.rb b/configs/components/libffi.rb
@@ -16,17 +16,9 @@
     pkg.environment "LDFLAGS", settings[:ldflags]
   elsif platform.is_solaris?
     pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}"
-    # use pl-build-tools for agent-runtime-7.x and /opt/csw for agent-runtime-main project
-    # if settings[:runtime_project] =~ /7.x/ # try using pl-build-tools to see if that's what the issue is
-    #   pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}"
-    # else
-    #   pkg.environment "PATH", "/opt/csw/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin:#{settings[:bindir]}"
-    #   pkg.environment "LD", "/opt/csw/bin/gld"
-    #   pkg.environment "AR", "/opt/csw/bin/gar"
-    # end
     pkg.environment "CFLAGS", "#{settings[:cflags]} -std=c99"
     pkg.environment "LDFLAGS", settings[:ldflags]
-    pkg.environment "MAKE", platform.make
+    pkg.environment 'MAKE', 'gmake'
   elsif platform.is_macos?
     pkg.environment "LDFLAGS", settings[:ldflags]
     pkg.environment "CFLAGS", settings[:cflags]

diff --git a/configs/components/openssl-3.0.rb b/configs/components/openssl-3.0.rb
@@ -60,7 +60,7 @@
     target = 'aix-gcc'
   elsif platform.is_solaris?
     pkg.environment 'PATH', '/opt/csw/bin:$(PATH):/usr/local/bin:/usr/ccs/bin:/usr/sfw/bin'
-    pkg.environment 'CC', "/opt/csw/bin/#{settings[:platform_triple]}-gcc"
+    pkg.environment 'CC', "/opt/csw/bin/gcc"
 
     cflags = "#{settings[:cflags]} -fPIC"
     ldflags = "-R/opt/csw/#{settings[:platform_triple]}/lib -Wl,-rpath=#{settings[:libdir]} -L/opt/csw/#{settings[:platform_triple]}/lib"

diff --git a/configs/platforms/solaris-11-i386.rb b/configs/platforms/solaris-11-i386.rb
@@ -2,12 +2,12 @@
   plat.inherit_from_default
   plat.make "gmake"
 
-#   packages = %w(
-#     # pl-binutils-i386
-#     # pl-cmake
-#     # pl-gcc-i386
-#     # pl-pkg-config
-#   )
+   packages = %w(
+     pl-binutils-i386
+     pl-cmake
+     pl-gcc-i386
+     pl-pkg-config
+   )
 
   plat.provision_with("pkg install #{packages.join(' ')}")
 
@@ -41,10 +41,7 @@
 basedir=default" > /var/tmp/vanagon-noask;
   echo "mirror=https://artifactory.delivery.puppetlabs.net/artifactory/generic__remote_opencsw_mirror/testing" > /var/tmp/vanagon-pkgutil.conf;
   pkgadd -n -a /var/tmp/vanagon-noask -d http://get.opencsw.org/now all
-  /opt/csw/bin/pkgutil -y -i autoconf || exit 1;
-  /opt/csw/bin/pkgutil -y -i gcc4core || exit 1;
-  # /opt/csw/bin/pkgutil -y -i perl;
-  /opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i libffi_dev || exit 1;
+  /opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i libffi_dev autoconf gcc4core|| exit 1;
 
   ntpdate pool.ntp.org]
   plat.output_dir File.join("solaris", "11", "PC1")