File tree 6 files changed +25
-4
lines changed
6 files changed +25
-4
lines changed Original file line number Diff line number Diff line change 19
19
pkg . build_requires "ruby-#{ ruby_version } "
20
20
pkg . build_requires "augeas"
21
21
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
+
23
28
if platform . is_aix?
24
29
if platform . name == 'aix-7.1-ppc'
25
30
pkg . environment "CC" , "/opt/pl-build-tools/bin/gcc"
Original file line number Diff line number Diff line change 78
78
pkg . environment 'optflags' , "-O2 -fPIC -g0 "
79
79
elsif platform . is_solaris?
80
80
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'
81
84
else
82
85
pkg . environment 'optflags' , '-O2'
83
86
end
108
111
special_flags += " --with-baseruby=no --enable-dtrace=no "
109
112
end
110
113
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
112
117
special_flags += " --with-baseruby=no "
113
118
elsif platform . is_windows?
114
119
# ruby's configure script guesses the build host is `cygwin`, because we're using
133
138
'osx-11-arm64' ,
134
139
'osx-12-arm64' ,
135
140
'redhatfips-7-x86_64' ,
141
+ 'sles-11-x86_64' ,
136
142
'sles-12-ppc64le' ,
137
143
'solaris-11-sparc' ,
138
144
'solaris-113-sparc' ,
Original file line number Diff line number Diff line change 5
5
pkg . build_requires "ruby-#{ settings [ :ruby_version ] } "
6
6
if !platform . is_cross_compiled? && platform . architecture == 'sparc'
7
7
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)"
8
10
else
9
11
pkg . environment "PATH" , "$(PATH):/usr/ccs/bin:/usr/sfw/bin"
10
12
end
Original file line number Diff line number Diff line change 87
87
else
88
88
pkg . environment "PATH" , "/opt/pl-build-tools/bin:/opt/csw/bin:$(PATH)"
89
89
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)'
90
94
end
91
95
92
96
# With Ruby 3.2 on Solaris-11 we install OpenSCW's libffi, no need to copy over the system libffi
97
101
end
98
102
99
103
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?
101
104
102
105
if platform . is_cross_compiled? && !platform . is_macos?
103
106
base_ruby = case platform . name
Original file line number Diff line number Diff line change 3
3
pkg . environment "PROJECT_SHORTNAME" , "puppet"
4
4
pkg . add_source "file://resources/files/runtime/runtime.sh"
5
5
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
+
6
12
if platform . is_cross_compiled?
7
13
if platform . architecture =~ /aarch64|ppc64$|ppc64le/
8
14
libdir = File . join ( "/opt/pl-build-tools" , settings [ :platform_triple ] , "lib64" )
Original file line number Diff line number Diff line change 17
17
"zlib-devel"
18
18
]
19
19
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"
21
20
plat . provision_with "zypper install -y --oldpackage pl-cmake=3.2.3-13.sles11"
22
21
plat . install_build_dependencies_with "zypper -n --no-gpg-checks install -y"
23
22
plat . vmpooler_template "sles-11-x86_64"
You can’t perform that action at this time.
0 commit comments