Skip to content

Commit ed6cfa5

Browse files
(PA-7099) Some more solaris fixes
1 parent 58335aa commit ed6cfa5

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

configs/components/curl.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
pkg.build_requires "openssl-#{settings[:openssl_version]}"
1919
pkg.build_requires "puppet-ca-bundle"
20-
unless platform.is_windows?
20+
unless platform.is_windows? || platform.name =~ /solaris-11/
2121
pkg.build_requires "libpsl"
2222
end
2323

@@ -42,6 +42,14 @@
4242
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
4343
end
4444

45+
if(version.start_with?('8'))
46+
if(platform.name =~ /solaris-11/)
47+
pkg.environment "LD_LIBRARY_PATH", "/opt/csw/lib: "
48+
else
49+
pkg.environment "LD_LIBRARY_PATH", "/opt/csw/lib"
50+
end
51+
end
52+
4553
# Following lines should we removed once we drop curl 7
4654
if version.start_with?('7')
4755
pkg.apply_patch 'resources/patches/curl/CVE-2023-27535.patch'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
echo "mirror=https://artifactory.delivery.puppetlabs.net/artifactory/generic__remote_opencsw_mirror/testing
5757
wgetopts=--no-check-certificate" > /var/tmp/vanagon-pkgutil.conf;
5858
pkgadd -n -a /var/tmp/vanagon-noask -d http://get.opencsw.org/now all
59-
/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
59+
/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
6060
]
6161
end

0 commit comments

Comments
 (0)