(PA-7099) Some more solaris fixes

configs/components/curl.rb

@@ -17,7 +17,7 @@
 
   pkg.build_requires "openssl-#{settings[:openssl_version]}"
   pkg.build_requires "puppet-ca-bundle"
-  unless platform.is_windows?
+  unless platform.is_windows? || platform.name =~ /solaris-11/
     pkg.build_requires "libpsl"
   end
 
@@ -42,6 +42,14 @@
     pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
   end
 
+  if(version.start_with?('8'))
+    if(platform.name =~ /solaris-11/)
+      pkg.environment "LD_LIBRARY_PATH", "/opt/csw/lib: "
+    else
+      pkg.environment "LD_LIBRARY_PATH", "/opt/csw/lib"
+    end
+  end
+
   # Following lines should we removed once we drop curl 7
   if version.start_with?('7')
     pkg.apply_patch 'resources/patches/curl/CVE-2023-27535.patch'

configs/platforms/solaris-11-native-sparc.rb

@@ -56,6 +56,6 @@
 echo "mirror=https://artifactory.delivery.puppetlabs.net/artifactory/generic__remote_opencsw_mirror/testing
 wgetopts=--no-check-certificate" > /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 -U && /opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i bison CSWxz-5.6.3,REV=2024.10.10 libunistring_dev python33 || exit 1
+/opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -U && /opt/csw/bin/pkgutil --config=/var/tmp/vanagon-pkgutil.conf -y -i bison CSWxz-5.6.3,REV=2024.10.10 libunistring_dev python33 libpsl_dev || exit 1
 ]
 end