Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(PA-4872) openssl 3 solaris 11 x86 #691

Merged
merged 2 commits into from
Jul 7, 2023
Merged

(PA-4872) openssl 3 solaris 11 x86 #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c40aaf4
(PA-4872) Build OpenSSL 3.0 for Solaris 11 x86_64
AriaXLi Jun 29, 2023
c47a9e2
(PA-4872) OpenSSL 3 work for Solaris-11-x86-64
cthorn42 Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions configs/components/openssl-3.0.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion configs/platforms/solaris-11-i386.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
platform "solaris-11-i386" do |plat|
plat.inherit_from_default
plat.make "gmake"

packages = %w(
pl-binutils-i386
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion configs/projects/_shared-agent-settings.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down