Merge pull request #691 from cthorn42/PA-4872/openssl_3_solaris_11_x86

Pa 4872/openssl 3 solaris 11 x86
puppetlabs · Jul 7, 2023 · 7029ef2 · 7029ef2
2 parents 46c127e + c47a9e2
commit 7029ef2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/configs/components/openssl-3.0.rb b/configs/components/openssl-3.0.rb
@@ -12,6 +12,8 @@
  pkg.build_requires 'perl-core'
  elsif platform.is_windows?
  pkg.build_requires 'strawberryperl'
+ elsif platform.is_solaris?
+ # perl is installed in platform definition
  else
  pkg.build_requires 'perl'
  end
@@ -57,13 +59,13 @@
  # see https://www.ibm.com/docs/en/aix/7.2?topic=l-ld-command about -R<path>, which is equivalent to -rpath
  ldflags = "#{settings[:ldflags]} -Wl,-R#{settings[:libdir]} -latomic -lm"
  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"
+ 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/gcc"
 
- #  cflags = "#{settings[:cflags]} -fPIC"
- # ldflags = "-R/opt/pl-build-tools/#{settings[:platform_triple]}/lib -Wl,-rpath=#{settings[:libdir]} -L/opt/pl-build-tools/#{settings[:platform_triple]}/lib"
- #  target = platform.architecture =~ /86/ ? 'solaris-x86-gcc' : 'solaris-sparcv9-gcc'
+ cflags = "#{settings[:cflags]} -fPIC"
+  ldflags = "-R/opt/csw/#{settings[:platform_triple]}/lib -Wl,-rpath=#{settings[:libdir]} -L/opt/csw/#{settings[:platform_triple]}/lib"
+ target = platform.architecture =~ /86/ ? 'solaris-x86-gcc' : 'solaris-sparcv9-gcc'
  elsif platform.is_macos?
  pkg.environment 'PATH', '/opt/pl-build-tools/bin:$(PATH):/usr/local/bin'
 

diff --git a/configs/platforms/solaris-11-i386.rb b/configs/platforms/solaris-11-i386.rb
@@ -1,5 +1,6 @@
 platform "solaris-11-i386" do |plat|
  plat.inherit_from_default
+ plat.make "gmake"
 
  packages = %w(
  pl-binutils-i386
@@ -41,7 +42,6 @@
  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 --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")
 end
diff --git a/configs/projects/_shared-agent-settings.rb b/configs/projects/_shared-agent-settings.rb
@@ -156,7 +156,7 @@
  proj.setting(:ldflags, "-L#{proj.libdir} -Wl,-rpath=#{proj.libdir},-z,relro,-z,now")
 end
 
-if ruby_version_x == "3" && !platform.is_solaris?
+if ruby_version_x == "3"
  proj.setting(:openssl_version, '3.0')
 elsif platform.name =~ /^redhatfips-/
  proj.setting(:openssl_version, '1.1.1-fips')