File tree Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change 118118 special_flags += " --with-openssl-dir=#{ settings [ :prefix ] } "
119119 elsif platform . is_solaris? && platform . architecture == "sparc"
120120 special_flags += " --with-baseruby=#{ host_ruby } --enable-close-fds-by-recvmsg-with-peek "
121- elsif platform . name =~ /el-6/
121+ elsif platform . name =~ /el-6/ || platform . name =~ /sles-11-x86_64/
122+ # Since we're not cross compiling, ignore old ruby versions that happen to be in the PATH
123+ # and force ruby to build miniruby and use that to bootstrap the rest of the build
122124 special_flags += " --with-baseruby=no "
123125 elsif platform . is_windows?
124126 special_flags = " CPPFLAGS='-DFD_SETSIZE=2048' debugflags=-g --prefix=#{ ruby_dir } --with-opt-dir=#{ settings [ :prefix ] } "
130132 'osx-11-arm64' ,
131133 'osx-12-arm64' ,
132134 'redhatfips-7-x86_64' ,
135+ 'sles-11-x86_64' ,
133136 'sles-12-ppc64le' ,
134137 'solaris-10-sparc' ,
135138 'solaris-11-sparc' ,
Original file line number Diff line number Diff line change 88 "aaa_base" ,
99 "autoconf" ,
1010 "automake" ,
11- "gcc" ,
12- "java-1_7_1-ibm-devel" ,
1311 "libbz2-devel" ,
1412 "make" ,
1513 "pkgconfig" ,
2018 "zlib-devel"
2119 ]
2220 plat . provision_with ( "zypper -n --no-gpg-checks install -y #{ packages . join ( ' ' ) } " )
21+ plat . provision_with "zypper install -y --oldpackage pl-gcc=4.8.2-1"
22+ plat . provision_with "zypper install -y --oldpackage pl-cmake=3.2.3-13.sles11"
2323 plat . install_build_dependencies_with "zypper -n --no-gpg-checks install -y"
2424 plat . vmpooler_template "sles-11-x86_64"
2525end
You can’t perform that action at this time.
0 commit comments