Skip to content

Commit 2a1b728

Browse files
committed
(PA-5998) Enable puppet-runtime builds for sles11-main
1 parent 7bff818 commit 2a1b728

File tree

6 files changed

+25
-4
lines changed

6 files changed

+25
-4
lines changed

configs/components/_base-ruby-augeas.rb

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@
1919
pkg.build_requires "ruby-#{ruby_version}"
2020
pkg.build_requires "augeas"
2121

22-
pkg.environment "PATH", "$(PATH):/opt/pl-build-tools/bin:/usr/local/bin:/opt/csw/bin:/usr/ccs/bin:/usr/sfw/bin"
22+
if platform.name == 'sles-11-x86_64'
23+
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH)"
24+
else
25+
pkg.environment "PATH", "$(PATH):/opt/pl-build-tools/bin:/usr/local/bin:/opt/csw/bin:/usr/ccs/bin:/usr/sfw/bin"
26+
end
27+
2328
if platform.is_aix?
2429
if platform.name == 'aix-7.1-ppc'
2530
pkg.environment "CC", "/opt/pl-build-tools/bin/gcc"

configs/components/ruby-3.2.3.rb

+7-1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@
7878
pkg.environment 'optflags', "-O2 -fPIC -g0 "
7979
elsif platform.is_solaris?
8080
pkg.environment 'optflags', '-O1'
81+
elsif platform.name == 'sles-11-x86_64'
82+
pkg.environment 'PATH', '/opt/pl-build-tools/bin:$(PATH)'
83+
pkg.environment 'optflags', '-O2'
8184
else
8285
pkg.environment 'optflags', '-O2'
8386
end
@@ -108,7 +111,9 @@
108111
special_flags += " --with-baseruby=no --enable-dtrace=no "
109112
end
110113
special_flags += "--enable-close-fds-by-recvmsg-with-peek "
111-
elsif platform.name =~ /el-6/
114+
elsif platform.name =~ /el-6/ || platform.name =~ /sles-11-x86_64/
115+
# Since we're not cross compiling, ignore old ruby versions that happen to be in the PATH
116+
# and force ruby to build miniruby and use that to bootstrap the rest of the build
112117
special_flags += " --with-baseruby=no "
113118
elsif platform.is_windows?
114119
# ruby's configure script guesses the build host is `cygwin`, because we're using
@@ -133,6 +138,7 @@
133138
'osx-11-arm64',
134139
'osx-12-arm64',
135140
'redhatfips-7-x86_64',
141+
'sles-11-x86_64',
136142
'sles-12-ppc64le',
137143
'solaris-11-sparc',
138144
'solaris-113-sparc',

configs/components/ruby-shadow.rb

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
pkg.build_requires "ruby-#{settings[:ruby_version]}"
66
if !platform.is_cross_compiled? && platform.architecture == 'sparc'
77
pkg.environment "PATH", "$(PATH):/opt/pl-build-tools/bin:/usr/ccs/bin:/usr/sfw/bin"
8+
elsif platform.name == 'sles-11-x86_64'
9+
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH)"
810
else
911
pkg.environment "PATH", "$(PATH):/usr/ccs/bin:/usr/sfw/bin"
1012
end

configs/components/rubygem-ffi.rb

+4-1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@
8787
else
8888
pkg.environment "PATH", "/opt/pl-build-tools/bin:/opt/csw/bin:$(PATH)"
8989
end
90+
elsif platform.is_aix?
91+
pkg.environment 'PATH', '/opt/freeware/bin:/opt/pl-build-tools/bin:$(PATH)'
92+
elsif platform.name == 'sles-11-x86_64'
93+
pkg.environment 'PATH', '/opt/pl-build-tools/bin:$(PATH)'
9094
end
9195

9296
# With Ruby 3.2 on Solaris-11 we install OpenSCW's libffi, no need to copy over the system libffi
@@ -97,7 +101,6 @@
97101
end
98102

99103
pkg.environment 'PKG_CONFIG_PATH', '/opt/puppetlabs/puppet/lib/pkgconfig:$(PKG_CONFIG_PATH)'
100-
pkg.environment 'PATH', '/opt/freeware/bin:/opt/pl-build-tools/bin:$(PATH)' if platform.is_aix?
101104

102105
if platform.is_cross_compiled? && !platform.is_macos?
103106
base_ruby = case platform.name

configs/components/runtime-agent.rb

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
pkg.environment "PROJECT_SHORTNAME", "puppet"
44
pkg.add_source "file://resources/files/runtime/runtime.sh"
55

6+
if platform.name =~ /sles-11-x86_64/ && settings[:ruby_version] =~ /2.7/
7+
pkg.install do
8+
"zypper install -y --oldpackage pl-gcc=4.8.2-1"
9+
end
10+
end
11+
612
if platform.is_cross_compiled?
713
if platform.architecture =~ /aarch64|ppc64$|ppc64le/
814
libdir = File.join("/opt/pl-build-tools", settings[:platform_triple], "lib64")

configs/platforms/sles-11-x86_64.rb

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"zlib-devel"
1818
]
1919
plat.provision_with("zypper -n --no-gpg-checks install -y #{packages.join(' ')}")
20-
plat.provision_with "zypper install -y --oldpackage pl-gcc=4.8.2-1"
2120
plat.provision_with "zypper install -y --oldpackage pl-cmake=3.2.3-13.sles11"
2221
plat.install_build_dependencies_with "zypper -n --no-gpg-checks install -y"
2322
plat.vmpooler_template "sles-11-x86_64"

0 commit comments

Comments
 (0)