Skip to content

Commit

Permalink
(PA-1547) Update Ruby 2.3.3 to 2.3.5
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 4b6149e commit 890ad9a
Show file tree
Hide file tree
Showing 26 changed files with 207 additions and 66 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ an ssh key beyond what is listed in .ssh/config).
#### Building different ruby versions
There are multiple ruby versions available to use in puppet-agent. To switch between ruby versions, update the `ruby_version` and `gem_home` settings in the [puppet-agent project config](https://github.com/puppetlabs/puppet-agent/blob/master/configs/projects/puppet-agent.rb)

To switch to ruby 2.3.3:
To switch to ruby 2.3.5:

```
proj.setting(:ruby_version, "2.3.3")`
proj.setting(:ruby_version, "2.3.5")`
proj.setting(:gem_home, File.join(proj.libdir, "ruby", "gems", "2.3.0"))
```

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
component "ruby-2.3.3" do |pkg, settings, platform|
pkg.version "2.3.3"
pkg.md5sum "e485f3a55649eb24a1e2e1a40bc120df"
component "ruby-2.3.5" do |pkg, settings, platform|
pkg.version "2.3.5"
pkg.md5sum "dda70c000632a83af5d15dfcf3e00a3e"
pkg.url "https://cache.ruby-lang.org/pub/ruby/2.3/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_233/windows_ruby_gem_wrapper.bat"
pkg.add_source "file://resources/files/ruby_235/windows_ruby_gem_wrapper.bat"
end

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

base = 'resources/patches/ruby_233'
base = 'resources/patches/ruby_235'

# 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 @@ -97,13 +97,20 @@


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.environment "CC", "/opt/pl-build-tools/bin/gcc"
pkg.environment "LDFLAGS", settings[:ldflags]
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 @@ -117,7 +124,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_233/rbconfig/rbconfig-#{settings[:platform_triple]}.rb"
pkg.add_source "file://resources/files/ruby_235/rbconfig/rbconfig-#{settings[:platform_triple]}.rb"
pkg.build_requires 'runtime' if platform.is_cross_compiled_linux?
end

Expand Down Expand Up @@ -169,7 +176,7 @@
pkg.build_requires 'pl-ruby'
end

# During Ruby 2.3.3's configure step on a cross-compiled host, the system cannot
# During Ruby 2.3.5's configure step on a cross-compiled host, the system cannot
# determine whether recvmsg requires peek when closing fds, so we must set it
# manually. Without this, we were getting builds missing the socket library (PA-544).
special_flags += " --with-baseruby=#{settings[:host_ruby]} --enable-close-fds-by-recvmsg-with-peek "
Expand All @@ -195,6 +202,8 @@
special_flags = " CPPFLAGS='-DFD_SETSIZE=2048' debugflags=-g --prefix=#{settings[:ruby_dir]} --with-opt-dir=#{settings[:prefix]} "
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
Expand Down
2 changes: 1 addition & 1 deletion configs/platforms/aix-5.3-ppc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
# Basic vanagon operations require mktemp, rsync, coreutils, tar and sed so leave this in there
plat.provision_with "rpm -Uvh --replacepkgs http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/mktemp-1.7-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/rsync-3.0.6-1.aix5.3.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/coreutils-5.2.1-2.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/sed-4.1.1-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/make-3.80-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/tar-1.14-2.aix5.1.ppc.rpm"

plat.install_build_dependencies_with "rpm -Uvh --replacepkgs "
plat.install_build_dependencies_with "rpm -Uvh --replacepkgs --replacefiles "
plat.build_host ["pe-aix-53-builder.delivery.puppetlabs.net"]
end
2 changes: 1 addition & 1 deletion configs/platforms/aix-6.1-ppc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
# Basic vanagon operations require mktemp, rsync, coreutils, make, tar and sed so leave this in there
plat.provision_with "rpm -Uvh --replacepkgs http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/mktemp-1.7-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/rsync-3.0.6-1.aix5.3.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/coreutils-5.2.1-2.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/sed-4.1.1-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/make-3.80-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/tar-1.22-1.aix6.1.ppc.rpm"

plat.install_build_dependencies_with "rpm -Uvh --replacepkgs "
plat.install_build_dependencies_with "rpm -Uvh --replacepkgs --replacefiles "
plat.build_host ["pe-aix-61-builder.delivery.puppetlabs.net"]
end
2 changes: 1 addition & 1 deletion configs/platforms/aix-7.1-ppc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
# Basic vanagon operations require mktemp, rsync, coreutils, tar and sed so leave this in there
plat.provision_with "rpm -Uvh --replacepkgs http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/mktemp-1.7-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/rsync-3.0.6-1.aix5.3.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/coreutils-5.2.1-2.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/sed-4.1.1-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/make-3.80-1.aix5.1.ppc.rpm http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/tar-1.22-1.aix6.1.ppc.rpm"

plat.install_build_dependencies_with "rpm -Uvh --replacepkgs "
plat.install_build_dependencies_with "rpm -Uvh --replacepkgs --replacefiles "
plat.build_host ["pe-aix-71-builder.delivery.puppetlabs.net"]
end
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# This file was created by puppet-agent for Debian-8-armhf.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/arm-linux-gnueabihf")
DESTDIR = '' unless defined? DESTDIR
Expand Down Expand Up @@ -197,7 +197,7 @@ module RbConfig
CONFIG["build_cpu"] = "arm"
CONFIG["build"] = "arm-unknown-linux-gnueabihf"
CONFIG["RUBY_RELEASE_DATE"] = "2016-04-01"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
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,8 +3,8 @@
# changes made to this file will be lost the next time ruby is built.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/i386-solaris2.10")
DESTDIR = '' unless defined? DESTDIR
Expand Down Expand Up @@ -198,7 +198,7 @@ module RbConfig
CONFIG["build_cpu"] = "i386"
CONFIG["build"] = "i386-pc-solaris2.10"
CONFIG["RUBY_RELEASE_DATE"] = "2015-04-13"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# changes made to this file will be lost the next time ruby is built.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/i386-solaris2.11")
DESTDIR = '' unless defined? DESTDIR
Expand Down Expand Up @@ -196,7 +196,7 @@ module RbConfig
CONFIG["build_cpu"] = "i386"
CONFIG["build"] = "i386-pc-solaris2.11"
CONFIG["RUBY_RELEASE_DATE"] = "2015-08-18"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

module RbConfig
RUBY_VERSION.start_with?("2.3.") or
raise "ruby lib version (2.3.3) doesn't match executable version (#{RUBY_VERSION})"
raise "ruby lib version (2.3.5) doesn't match executable version (#{RUBY_VERSION})"

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/i386-mingw32")
DESTDIR = TOPDIR && TOPDIR[/\A[a-z]:/i] || '' unless defined? DESTDIR
Expand Down Expand Up @@ -190,7 +190,7 @@ module RbConfig
CONFIG["build_vendor"] = "unknown"
CONFIG["build_cpu"] = "x86_64"
CONFIG["build"] = "x86_64-unknown-cygwin"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
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,8 +3,8 @@
# changes made to this file will be lost the next time ruby is built.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/powerpc-aix5.3.0.0")
DESTDIR = '' unless defined? DESTDIR
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"] = "2015-04-13"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# changes made to this file will be lost the next time ruby is built.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/powerpc-aix6.1.0.0")
DESTDIR = '' unless defined? DESTDIR
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"] = "2015-04-13"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# changes made to this file will be lost the next time ruby is built.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/powerpc-aix7.1.0.0")
DESTDIR = '' unless defined? DESTDIR
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"] = "2015-04-13"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# changes made to this file will be lost the next time ruby is built.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/powerpc-linux")
DESTDIR = '' unless defined? DESTDIR
Expand Down Expand Up @@ -198,7 +198,7 @@ module RbConfig
CONFIG["build_cpu"] = "powerpc"
CONFIG["build"] = "powerpc-linux-gnu"
CONFIG["RUBY_RELEASE_DATE"] = "2015-04-13"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
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 @@ -2,8 +2,8 @@
# Any changes made to this file will be lost the next time ruby is built.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib/powerpc64le-linux-gnu/ruby/2.3.0")
DESTDIR = '' unless defined? DESTDIR
Expand Down Expand Up @@ -197,7 +197,7 @@ module RbConfig
CONFIG["build_cpu"] = "powerpc64le"
CONFIG["build"] = "powerpc64le-ibm-linux-gnu"
CONFIG["RUBY_RELEASE_DATE"] = "2016-03-30"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Any changes made to this file will be lost the next time ruby is built.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib64/ruby/")
DESTDIR = '' unless defined? DESTDIR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# changes made to this file will be lost the next time ruby is built.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/s390x-linux")
DESTDIR = '' unless defined? DESTDIR
Expand Down Expand Up @@ -198,7 +198,7 @@ module RbConfig
CONFIG["build_cpu"] = "s390x"
CONFIG["build"] = "s390x-ibm-linux-gnu"
CONFIG["RUBY_RELEASE_DATE"] = "2016-03-30"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# changes made to this file will be lost the next time ruby is built.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/sparc-solaris2.10")
DESTDIR = '' unless defined? DESTDIR
Expand Down Expand Up @@ -198,7 +198,7 @@ module RbConfig
CONFIG["build_cpu"] = "sparc"
CONFIG["build"] = "sparc-sun-solaris2.10"
CONFIG["RUBY_RELEASE_DATE"] = "2015-04-13"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# changes made to this file will be lost the next time ruby is built.

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

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/sparc-solaris2.11")
DESTDIR = '' unless defined? DESTDIR
Expand Down Expand Up @@ -196,7 +196,7 @@ module RbConfig
CONFIG["build_cpu"] = "sparc"
CONFIG["build"] = "sparc-sun-solaris2.11"
CONFIG["RUBY_RELEASE_DATE"] = "2015-04-13"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
CONFIG["target_alias"] = ""
CONFIG["host_alias"] = ""
CONFIG["build_alias"] = ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

module RbConfig
RUBY_VERSION.start_with?("2.3.") or
raise "ruby lib version (2.3.3) doesn't match executable version (#{RUBY_VERSION})"
raise "ruby lib version (2.3.5) doesn't match executable version (#{RUBY_VERSION})"

TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.3.0/x64-mingw32")
DESTDIR = TOPDIR && TOPDIR[/\A[a-z]:/i] || '' unless defined? DESTDIR
Expand All @@ -24,7 +24,7 @@ module RbConfig
CONFIG["prefix"] = (TOPDIR || DESTDIR + "C:/ProgramFiles64Folder/PuppetLabs/Puppet/sys/ruby")
CONFIG["ruby_install_name"] = "$(RUBY_BASE_NAME)"
CONFIG["RUBY_INSTALL_NAME"] = "$(RUBY_BASE_NAME)"
CONFIG["RUBY_SO_NAME"] = "x64-msvcrt-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)$(TEENY)"
CONFIG["RUBY_SO_NAME"] = "x64-msvcrt-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0"
CONFIG["exec"] = "exec"
CONFIG["ruby_pc"] = "ruby-2.3.pc"
CONFIG["PACKAGE"] = "ruby"
Expand Down Expand Up @@ -190,7 +190,7 @@ module RbConfig
CONFIG["build_vendor"] = "unknown"
CONFIG["build_cpu"] = "x86_64"
CONFIG["build"] = "x86_64-unknown-cygwin"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.3"
CONFIG["RUBY_PROGRAM_VERSION"] = "2.3.5"
CONFIG["cxxflags"] = " $(optflags) $(debugflags) $(warnflags)"
CONFIG["cppflags"] = ""
CONFIG["cflags"] = " $(optflags) $(debugflags) $(warnflags)"
Expand Down
Loading

0 comments on commit 890ad9a

Please sign in to comment.