From 3fc72f55659af7021c819b2b29151bd877abad4b Mon Sep 17 00:00:00 2001 From: Shubham Shinde Date: Fri, 2 Feb 2024 19:16:34 +0530 Subject: [PATCH] (PA-5999) Add support for SLES-11 (Intel) - Removed the java package because its no longer needed and removed gcc(version 4.3.4 in the image) because we are supposed to be using pl-gcc (version 4.8.4). - Added SLES-11 to without-dtrace platforms to build ruby - Add --with-baseruby=no to configure script to not use base ruby since the image has ruby 1.8.7. --- configs/components/ruby-2.7.8.rb | 5 ++++- configs/platforms/sles-11-x86_64.rb | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/components/ruby-2.7.8.rb b/configs/components/ruby-2.7.8.rb index c55074862..646ee8e1d 100644 --- a/configs/components/ruby-2.7.8.rb +++ b/configs/components/ruby-2.7.8.rb @@ -118,7 +118,9 @@ special_flags += " --with-openssl-dir=#{settings[:prefix]} " elsif platform.is_solaris? && platform.architecture == "sparc" special_flags += " --with-baseruby=#{host_ruby} --enable-close-fds-by-recvmsg-with-peek " - elsif platform.name =~ /el-6/ + elsif platform.name =~ /el-6/ || platform.name =~ /sles-11-x86_64/ + # Since we're not cross compiling, ignore old ruby versions that happen to be in the PATH + # and force ruby to build miniruby and use that to bootstrap the rest of the build special_flags += " --with-baseruby=no " elsif platform.is_windows? special_flags = " CPPFLAGS='-DFD_SETSIZE=2048' debugflags=-g --prefix=#{ruby_dir} --with-opt-dir=#{settings[:prefix]} " @@ -130,6 +132,7 @@ 'osx-11-arm64', 'osx-12-arm64', 'redhatfips-7-x86_64', + 'sles-11-x86_64', 'sles-12-ppc64le', 'solaris-10-sparc', 'solaris-11-sparc', diff --git a/configs/platforms/sles-11-x86_64.rb b/configs/platforms/sles-11-x86_64.rb index f1da53443..86df63248 100644 --- a/configs/platforms/sles-11-x86_64.rb +++ b/configs/platforms/sles-11-x86_64.rb @@ -8,8 +8,6 @@ "aaa_base", "autoconf", "automake", - "gcc", - "java-1_7_1-ibm-devel", "libbz2-devel", "make", "pkgconfig",