Skip to content

Commit

Permalink
(PA-1547) Update Ruby 2.4.1 to 2.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Enis Inan authored and Enis Inan committed Oct 10, 2017
1 parent 890ad9a commit 89fe682
Show file tree
Hide file tree
Showing 26 changed files with 251 additions and 76 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
component "ruby-2.4.1" do |pkg, settings, platform|
pkg.version "2.4.1"
pkg.md5sum "782bca562e474dd25956dd0017d92677"
component "ruby-2.4.2" do |pkg, settings, platform|
pkg.version "2.4.2"
pkg.md5sum "fe106eed9738c4e03813ab904f8d891c"
pkg.url "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-#{pkg.get_version}.tar.gz"
pkg.mirror "http://buildsources.delivery.puppetlabs.net/ruby-#{pkg.get_version}.tar.gz"

if platform.is_windows?
pkg.add_source "http://buildsources.delivery.puppetlabs.net/windows/elevate/elevate.exe", sum: "bd81807a5c13da32dd2a7157f66fa55d"
pkg.add_source "file://resources/files/windows/elevate.exe.config", sum: "a5aecf3f7335fa1250a0f691d754d561"
pkg.add_source "file://resources/files/ruby_241/windows_ruby_gem_wrapper.bat"
pkg.add_source "file://resources/files/ruby_242/windows_ruby_gem_wrapper.bat"
end

pkg.replaces 'pe-ruby'
Expand All @@ -18,7 +18,9 @@
pkg.replaces 'pe-ruby-ldap'
pkg.replaces 'pe-rubygem-gem2rpm'

base = 'resources/patches/ruby_241'
base = 'resources/patches/ruby_242'

pkg.apply_patch "#{base}/ostruct_remove_safe_nav_operator.patch"

# These are a pretty smelly hack, and they run the risk of letting tests
# based on the generated data (that should otherwise fail) pass
Expand Down Expand Up @@ -101,11 +103,18 @@


if platform.is_aix?
pkg.apply_patch "#{base}/aix_ruby_2.1_libpath_with_opt_dir.patch"
# TODO: Remove this patch once PA-1607 is resolved.
pkg.apply_patch "#{base}/aix_revert_configure_in_changes.patch"

pkg.apply_patch "#{base}/aix_ruby_libpath_with_opt_dir.patch"
pkg.apply_patch "#{base}/aix_use_pl_build_tools_autoconf.patch"
pkg.apply_patch "#{base}/aix_ruby_2.1_fix_make_test_failure.patch"
pkg.build_requires "libedit"
pkg.build_requires "runtime"

# TODO: Remove this once PA-1607 is resolved.
pkg.build_requires "http://pl-build-tools.delivery.puppetlabs.net/aix/5.3/ppc/pl-autoconf-2.69-1.aix5.3.ppc.rpm"

# This normalizes the build string to something like AIX 7.1.0.0 rather
# than AIX 7.1.0.2 or something
special_flags += " --build=#{settings[:platform_triple]} "
Expand All @@ -120,7 +129,7 @@

# Cross-compiles require a hand-built rbconfig from the target system as does Solaris, AIX and Windies
if platform.is_cross_compiled_linux? || platform.is_solaris? || platform.is_aix? || platform.is_windows?
pkg.add_source "file://resources/files/ruby_241/rbconfig/rbconfig-#{settings[:platform_triple]}.rb"
pkg.add_source "file://resources/files/ruby_242/rbconfig/rbconfig-#{settings[:platform_triple]}.rb"
pkg.build_requires 'runtime' if platform.is_cross_compiled_linux?
end

Expand Down Expand Up @@ -207,6 +216,9 @@
end
end

# TODO: Remove this once PA-1607 is resolved.
pkg.configure { ["/opt/pl-build-tools/bin/autoconf"] } if platform.is_aix?

# Here we set --enable-bundled-libyaml to ensure that the libyaml included in
# ruby is used, even if the build system has a copy of libyaml available
pkg.configure do
Expand Down
2 changes: 1 addition & 1 deletion configs/projects/puppet-agent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
proj.setting(:libdir, File.join(proj.prefix, "lib"))
end

proj.setting(:ruby_version, "2.4.1")
proj.setting(:ruby_version, "2.4.2")
proj.setting(:gem_home, File.join(proj.libdir, "ruby", "gems", "2.4.0"))
proj.setting(:ruby_vendordir, File.join(proj.libdir, "ruby", "vendor_ruby"))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
# This file was created by puppet-agent for Debian-8-armhf.

module RbConfig
RUBY_VERSION == "2.4.1" or
raise "ruby lib version (2.4.1) doesn't match executable version (#{RUBY_VERSION})"
RUBY_VERSION == "2.4.2" or
raise "ruby lib version (2.4.2) doesn't match executable version (#{RUBY_VERSION})"

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.4.0/arm-linux-gnueabihf")
DESTDIR = '' unless defined? DESTDIR
CONFIG = {}
CONFIG["DESTDIR"] = DESTDIR
CONFIG["MAJOR"] = "2"
CONFIG["MINOR"] = "4"
CONFIG["TEENY"] = "1"
CONFIG["TEENY"] = "2"
CONFIG["PATCHLEVEL"] = "111"
CONFIG["INSTALL"] = '/usr/bin/install -c'
CONFIG["EXEEXT"] = ""
Expand Down Expand Up @@ -197,7 +197,7 @@ module RbConfig
CONFIG["build_cpu"] = "arm"
CONFIG["build"] = "arm-unknown-linux-gnueabihf"
CONFIG["RUBY_RELEASE_DATE"] = "2017-03-22"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.1"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.2"
CONFIG["target_alias"] = "arm-linux-gnueabihf"
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = "arm-linux-gnueabihf"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
# changes made to this file will be lost the next time ruby is built.

module RbConfig
RUBY_VERSION == "2.4.1" or
raise "ruby lib version (2.4.1) doesn't match executable version (#{RUBY_VERSION})"
RUBY_VERSION == "2.4.2" or
raise "ruby lib version (2.4.2) doesn't match executable version (#{RUBY_VERSION})"

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.4.0/i386-solaris2.10")
DESTDIR = '' unless defined? DESTDIR
CONFIG = {}
CONFIG["DESTDIR"] = DESTDIR
CONFIG["MAJOR"] = "2"
CONFIG["MINOR"] = "4"
CONFIG["TEENY"] = "1"
CONFIG["TEENY"] = "2"
CONFIG["PATCHLEVEL"] = "111"
CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c'
CONFIG["EXEEXT"] = ""
Expand Down Expand Up @@ -198,7 +198,7 @@ module RbConfig
CONFIG["build_cpu"] = "i386"
CONFIG["build"] = "i386-pc-solaris2.10"
CONFIG["RUBY_RELEASE_DATE"] = "2017-03-22"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.1"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.2"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
# changes made to this file will be lost the next time ruby is built.

module RbConfig
RUBY_VERSION == "2.4.1" or
raise "ruby lib version (2.4.1) doesn't match executable version (#{RUBY_VERSION})"
RUBY_VERSION == "2.4.2" or
raise "ruby lib version (2.4.2) doesn't match executable version (#{RUBY_VERSION})"

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.4.0/i386-solaris2.11")
DESTDIR = '' unless defined? DESTDIR
CONFIG = {}
CONFIG["DESTDIR"] = DESTDIR
CONFIG["MAJOR"] = "2"
CONFIG["MINOR"] = "4"
CONFIG["TEENY"] = "1"
CONFIG["TEENY"] = "2"
CONFIG["PATCHLEVEL"] = "111"
CONFIG["INSTALL"] = '/usr/ccs/bin/ginstall -c'
CONFIG["EXEEXT"] = ""
Expand Down Expand Up @@ -196,7 +196,7 @@ module RbConfig
CONFIG["build_cpu"] = "i386"
CONFIG["build"] = "i386-pc-solaris2.11"
CONFIG["RUBY_RELEASE_DATE"] = "2017-03-22"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.1"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.2"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module RbConfig
RUBY_VERSION.start_with?("2.4.") or
raise "ruby lib version (2.4.1) doesn't match executable version (#{RUBY_VERSION})"
raise "ruby lib version (2.4.2) doesn't match executable version (#{RUBY_VERSION})"

# Ruby installed directory.
TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.4.0/i386-mingw32")
Expand All @@ -23,7 +23,7 @@ module RbConfig
CONFIG["DESTDIR"] = DESTDIR
CONFIG["MAJOR"] = "2"
CONFIG["MINOR"] = "4"
CONFIG["TEENY"] = "1"
CONFIG["TEENY"] = "2"
CONFIG["PATCHLEVEL"] = "111"
CONFIG["INSTALL"] = '/bin/install -c'
CONFIG["EXEEXT"] = ".exe"
Expand Down Expand Up @@ -200,7 +200,7 @@ module RbConfig
CONFIG["build_vendor"] = "unknown"
CONFIG["build_cpu"] = "x86_64"
CONFIG["build"] = "x86_64-unknown-cygwin"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.1"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.2"
CONFIG["cxxflags"] = "$(optflags) $(debugflags) $(warnflags)"
CONFIG["cppflags"] = ""
CONFIG["cflags"] = "$(optflags) $(debugflags) $(warnflags)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
# changes made to this file will be lost the next time ruby is built.

module RbConfig
RUBY_VERSION == "2.4.1" or
raise "ruby lib version (2.4.1) doesn't match executable version (#{RUBY_VERSION})"
RUBY_VERSION == "2.4.2" or
raise "ruby lib version (2.4.2) doesn't match executable version (#{RUBY_VERSION})"

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.4.0/powerpc-aix5.3.0.0")
DESTDIR = '' unless defined? DESTDIR
CONFIG = {}
CONFIG["DESTDIR"] = DESTDIR
CONFIG["MAJOR"] = "2"
CONFIG["MINOR"] = "4"
CONFIG["TEENY"] = "1"
CONFIG["TEENY"] = "2"
CONFIG["PATCHLEVEL"] = "111"
CONFIG["INSTALL"] = ''
CONFIG["EXEEXT"] = ""
Expand Down Expand Up @@ -198,7 +198,7 @@ module RbConfig
CONFIG["build_cpu"] = "powerpc"
CONFIG["build"] = "powerpc-ibm-aix5.3.0.0"
CONFIG["RUBY_RELEASE_DATE"] = "2017-03-22"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.1"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.2"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
# changes made to this file will be lost the next time ruby is built.

module RbConfig
RUBY_VERSION == "2.4.1" or
raise "ruby lib version (2.4.1) doesn't match executable version (#{RUBY_VERSION})"
RUBY_VERSION == "2.4.2" or
raise "ruby lib version (2.4.2) doesn't match executable version (#{RUBY_VERSION})"

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.4.0/powerpc-aix6.1.0.0")
DESTDIR = '' unless defined? DESTDIR
CONFIG = {}
CONFIG["DESTDIR"] = DESTDIR
CONFIG["MAJOR"] = "2"
CONFIG["MINOR"] = "4"
CONFIG["TEENY"] = "1"
CONFIG["TEENY"] = "2"
CONFIG["PATCHLEVEL"] = "111"
CONFIG["INSTALL"] = ''
CONFIG["EXEEXT"] = ""
Expand Down Expand Up @@ -198,7 +198,7 @@ module RbConfig
CONFIG["build_cpu"] = "powerpc"
CONFIG["build"] = "powerpc-ibm-aix6.1.0.0"
CONFIG["RUBY_RELEASE_DATE"] = "2017-03-22"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.1"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.2"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
# changes made to this file will be lost the next time ruby is built.

module RbConfig
RUBY_VERSION == "2.4.1" or
raise "ruby lib version (2.4.1) doesn't match executable version (#{RUBY_VERSION})"
RUBY_VERSION == "2.4.2" or
raise "ruby lib version (2.4.2) doesn't match executable version (#{RUBY_VERSION})"

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.4.0/powerpc-aix7.1.0.0")
DESTDIR = '' unless defined? DESTDIR
CONFIG = {}
CONFIG["DESTDIR"] = DESTDIR
CONFIG["MAJOR"] = "2"
CONFIG["MINOR"] = "4"
CONFIG["TEENY"] = "1"
CONFIG["TEENY"] = "2"
CONFIG["PATCHLEVEL"] = "111"
CONFIG["INSTALL"] = ''
CONFIG["EXEEXT"] = ""
Expand Down Expand Up @@ -198,7 +198,7 @@ module RbConfig
CONFIG["build_cpu"] = "powerpc"
CONFIG["build"] = "powerpc-ibm-aix7.1.0.0"
CONFIG["RUBY_RELEASE_DATE"] = "2017-03-22"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.1"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.2"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
# changes made to this file will be lost the next time ruby is built.

module RbConfig
RUBY_VERSION == "2.4.1" or
raise "ruby lib version (2.4.1) doesn't match executable version (#{RUBY_VERSION})"
RUBY_VERSION == "2.4.2" or
raise "ruby lib version (2.4.2) doesn't match executable version (#{RUBY_VERSION})"

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.4.0/powerpc-linux")
DESTDIR = '' unless defined? DESTDIR
CONFIG = {}
CONFIG["DESTDIR"] = DESTDIR
CONFIG["MAJOR"] = "2"
CONFIG["MINOR"] = "4"
CONFIG["TEENY"] = "1"
CONFIG["TEENY"] = "2"
CONFIG["PATCHLEVEL"] = "111"
CONFIG["INSTALL"] = '/usr/bin/install -c'
CONFIG["EXEEXT"] = ""
Expand Down Expand Up @@ -198,7 +198,7 @@ module RbConfig
CONFIG["build_cpu"] = "powerpc"
CONFIG["build"] = "powerpc-linux-gnu"
CONFIG["RUBY_RELEASE_DATE"] = "2017-03-22"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.1"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.2"
CONFIG["target_alias"] = "powerpc-linux-gnu"
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = "powerpc-linux-gnu"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

module RbConfig
RUBY_VERSION.start_with?("2.4.") or
raise "ruby lib version (2.4.1) doesn't match executable version (#{RUBY_VERSION})"
raise "ruby lib version (2.4.2) doesn't match executable version (#{RUBY_VERSION})"

# Ruby installed directory.
TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.4.0/powerpc64le-linux")
Expand All @@ -19,7 +19,7 @@ module RbConfig
CONFIG["DESTDIR"] = DESTDIR
CONFIG["MAJOR"] = "2"
CONFIG["MINOR"] = "4"
CONFIG["TEENY"] = "1"
CONFIG["TEENY"] = "2"
CONFIG["PATCHLEVEL"] = "111"
CONFIG["INSTALL"] = '/usr/bin/install -c'
CONFIG["EXEEXT"] = ""
Expand Down Expand Up @@ -196,7 +196,7 @@ module RbConfig
CONFIG["build_vendor"] = "unknown"
CONFIG["build_cpu"] = "powerpc64le"
CONFIG["build"] = "powerpc64le-unknown-linux-gnu"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.1"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.2"
CONFIG["cxxflags"] = "$(optflags) $(debugflags) $(warnflags)"
CONFIG["cppflags"] = ""
CONFIG["cflags"] = "$(optflags) $(debugflags) $(warnflags)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

module RbConfig
RUBY_VERSION.start_with?("2.4.") or
raise "ruby lib version (2.4.1) doesn't match executable version (#{RUBY_VERSION})"
raise "ruby lib version (2.4.2) doesn't match executable version (#{RUBY_VERSION})"

# Ruby installed directory.
TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.4.0/powerpc64le-linux")
Expand All @@ -21,7 +21,7 @@ module RbConfig
CONFIG["DESTDIR"] = DESTDIR
CONFIG["MAJOR"] = "2"
CONFIG["MINOR"] = "4"
CONFIG["TEENY"] = "1"
CONFIG["TEENY"] = "2"
CONFIG["PATCHLEVEL"] = "111"
CONFIG["INSTALL"] = '/usr/bin/install -c'
CONFIG["EXEEXT"] = ""
Expand Down Expand Up @@ -198,7 +198,7 @@ module RbConfig
CONFIG["build_vendor"] = "unknown"
CONFIG["build_cpu"] = "powerpc64le"
CONFIG["build"] = "powerpc64le-unknown-linux-gnu"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.1"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.2"
CONFIG["cxxflags"] = "$(optflags) $(debugflags) $(warnflags)"
CONFIG["cppflags"] = ""
CONFIG["cflags"] = "$(optflags) $(debugflags) $(warnflags)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

module RbConfig
RUBY_VERSION.start_with?("2.4.") or
raise "ruby lib version (2.4.1) doesn't match executable version (#{RUBY_VERSION})"
raise "ruby lib version (2.4.2) doesn't match executable version (#{RUBY_VERSION})"

# Ruby installed directory.
TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.4.0/powerpc64le-linux")
Expand All @@ -21,7 +21,7 @@ module RbConfig
CONFIG["DESTDIR"] = DESTDIR
CONFIG["MAJOR"] = "2"
CONFIG["MINOR"] = "4"
CONFIG["TEENY"] = "1"
CONFIG["TEENY"] = "2"
CONFIG["PATCHLEVEL"] = "111"
CONFIG["INSTALL"] = '/usr/bin/install -c'
CONFIG["EXEEXT"] = ""
Expand Down Expand Up @@ -198,7 +198,7 @@ module RbConfig
CONFIG["build_vendor"] = "unknown"
CONFIG["build_cpu"] = "powerpc64le"
CONFIG["build"] = "powerpc64le-redhat-linux-gnu"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.1"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.4.2"
CONFIG["cxxflags"] = "$(optflags) $(debugflags) $(warnflags)"
CONFIG["cppflags"] = ""
CONFIG["cflags"] = "$(optflags) $(debugflags) $(warnflags)"
Expand Down
Loading

0 comments on commit 89fe682

Please sign in to comment.