Merge pull request puppetlabs#7 from scotje/maint_windows_rbconfig

DavidS · web-flow · commit e946253a6b0b · 2017-05-31T13:56:21.000+01:00
(SDK-213) Add custom rbconfig stuff from puppet-agent for Windows.
diff --git a/configs/components/ruby-2.1.9.rb b/configs/components/ruby-2.1.9.rb
@@ -10,6 +10,13 @@
   base = 'resources/patches/ruby_219'
   pkg.apply_patch "#{base}/libyaml_cve-2014-9130.patch"
 
+  rbconfig_info = {
+    'x86_64-w64-mingw32' => {
+      :sum => "fe5656cd5fcba0a63b18857275e03808",
+      :target_double => 'x64-mingw32',
+    },
+  }
+
   special_flags = " --prefix=#{settings[:prefix]} --with-opt-dir=#{settings[:prefix]} "
 
   if platform.is_windows?
@@ -18,6 +25,8 @@
     pkg.apply_patch "#{base}/windows_remove_DL_deprecated_warning.patch"
     pkg.apply_patch "#{base}/windows_ruby_2.1_update_to_rubygems_2.4.5.1.patch"
     pkg.apply_patch "#{base}/update_rbinstall_for_windows.patch"
+
+    pkg.add_source "file://resources/files/ruby_219/rbconfig/rbconfig-#{settings[:platform_triple]}.rb"
   end
 
   pkg.build_requires "openssl"
@@ -116,6 +125,25 @@
       ]
     end
 
+    # Here we replace the rbconfig from our ruby compiled with our toolchain
+    # with an rbconfig from a ruby of the same version compiled with the system
+    # gcc. Without this, the rbconfig will be looking for a gcc that won't
+    # exist on a user system and will also pass flags which may not work on
+    # that system.
+    # We also disable a safety check in the rbconfig to prevent it from being
+    # loaded from a different ruby, because we're going to do that later to
+    # install compiled gems.
+    target_dir = File.join(settings[:libdir], "ruby", "2.1.0", rbconfig_info[settings[:platform_triple]][:target_double])
+
+    pkg.install do
+      [
+        "sed -i 's|raise|warn|g' #{target_dir}/rbconfig.rb",
+        "mkdir -p #{settings[:datadir]}/doc",
+        "cp #{target_dir}/rbconfig.rb #{settings[:datadir]}/doc",
+        "cp ../rbconfig-#{settings[:platform_triple]}.rb #{target_dir}/rbconfig.rb",
+      ]
+    end
+
     pkg.directory settings[:ruby_dir]
     pkg.directory settings[:ruby_bindir]
   end
diff --git a/resources/files/ruby_219/rbconfig/rbconfig-x86_64-w64-mingw32.rb b/resources/files/ruby_219/rbconfig/rbconfig-x86_64-w64-mingw32.rb
@@ -0,0 +1,270 @@
+# Custom rbconfig.rb file obtained from Puppet 1.9.3 installation and modified
+# to change build_os to "mingw32" as per PA-1086
+
+# This file was created by mkconfig.rb when ruby was built.  Any
+# changes made to this file will be lost the next time ruby is built.
+
+module RbConfig
+  RUBY_VERSION == "2.1.9" or
+    raise "ruby lib version (2.1.9) doesn't match executable version (#{RUBY_VERSION})"
+
+  TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/2.1.0/x64-mingw32")
+  DESTDIR = TOPDIR && TOPDIR[/\A[a-z]:/i] || '' unless defined? DESTDIR
+  CONFIG = {}
+  CONFIG["DESTDIR"] = DESTDIR
+  CONFIG["MAJOR"] = "2"
+  CONFIG["MINOR"] = "1"
+  CONFIG["TEENY"] = "0"
+  CONFIG["PATCHLEVEL"] = "490"
+  CONFIG["INSTALL"] = '/bin/install -c'
+  CONFIG["EXEEXT"] = ".exe"
+  CONFIG["prefix"] = (TOPDIR || DESTDIR + "C:/ProgramFiles64Folder/PuppetLabs/Puppet/sys/ruby")
+  CONFIG["ruby_install_name"] = "ruby"
+  CONFIG["RUBY_INSTALL_NAME"] = "ruby"
+  CONFIG["RUBY_SO_NAME"] = "x64-msvcrt-ruby210"
+  CONFIG["exec"] = "exec"
+  CONFIG["ruby_pc"] = "ruby-2.1.pc"
+  CONFIG["PACKAGE"] = "ruby"
+  CONFIG["BUILTIN_TRANSSRCS"] = " newline.c"
+  CONFIG["USE_RUBYGEMS"] = "YES"
+  CONFIG["MANTYPE"] = "doc"
+  CONFIG["NROFF"] = "/usr/bin/nroff"
+  CONFIG["vendorarchhdrdir"] = "$(vendorhdrdir)/$(sitearch)"
+  CONFIG["sitearchhdrdir"] = "$(sitehdrdir)/$(sitearch)"
+  CONFIG["rubyarchhdrdir"] = "$(rubyhdrdir)/$(arch)"
+  CONFIG["vendorhdrdir"] = "$(rubyhdrdir)/vendor_ruby"
+  CONFIG["sitehdrdir"] = "$(rubyhdrdir)/site_ruby"
+  CONFIG["rubyhdrdir"] = "$(includedir)/$(RUBY_VERSION_NAME)"
+  CONFIG["RUBY_SEARCH_PATH"] = ""
+  CONFIG["UNIVERSAL_INTS"] = ""
+  CONFIG["UNIVERSAL_ARCHNAMES"] = ""
+  CONFIG["configure_args"] = " '--enable-shared' '--enable-bundled-libyaml' '--disable-install-doc' '--disable-install-rdoc' '--host' 'x86_64-w64-mingw32' 'CPPFLAGS=-DFD_SETSIZE=2048' 'debugflags=-g' '--prefix=C:/ProgramFiles64Folder/PuppetLabs/Puppet/sys/ruby' '--with-opt-dir=C:/ProgramFiles64Folder/PuppetLabs/Puppet/puppet' 'host_alias=x86_64-w64-mingw32' 'LDFLAGS=-LC:/tools/pl-build-tools/lib -LC:/tools/mingw64/lib -LC:/ProgramFiles64Folder/PuppetLabs/Puppet/sys/ruby/lib'"
+  CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)"
+  CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)"
+  CONFIG["vendordir"] = "$(rubylibprefix)/vendor_ruby"
+  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
+  CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
+  CONFIG["sitedir"] = "$(rubylibprefix)/site_ruby"
+  CONFIG["rubyarchdir"] = "$(rubylibdir)/$(arch)"
+  CONFIG["rubylibdir"] = "$(rubylibprefix)/$(ruby_version)"
+  CONFIG["ruby_version"] = "2.1.0"
+  CONFIG["sitearch"] = "x64-msvcrt"
+  CONFIG["arch"] = "x64-mingw32"
+  CONFIG["sitearchincludedir"] = "$(includedir)/$(sitearch)"
+  CONFIG["archincludedir"] = "$(includedir)/$(arch)"
+  CONFIG["sitearchlibdir"] = "$(libdir)/$(sitearch)"
+  CONFIG["archlibdir"] = "$(libdir)/$(arch)"
+  CONFIG["libdirname"] = "libdir"
+  CONFIG["RUBY_EXEC_PREFIX"] = ""
+  CONFIG["RUBY_LIB_VERSION"] = ""
+  CONFIG["RUBY_LIB_VERSION_STYLE"] = "3\t/* full */"
+  CONFIG["RI_BASE_NAME"] = "ri"
+  CONFIG["ridir"] = "$(datarootdir)/$(RI_BASE_NAME)"
+  CONFIG["rubysitearchprefix"] = "$(rubylibprefix)/$(sitearch)"
+  CONFIG["rubyarchprefix"] = "$(rubylibprefix)/$(arch)"
+  CONFIG["MAKEFILES"] = "Makefile GNUmakefile"
+  CONFIG["PLATFORM_DIR"] = "win32"
+  CONFIG["THREAD_MODEL"] = "win32"
+  CONFIG["SYMBOL_PREFIX"] = ""
+  CONFIG["EXPORT_PREFIX"] = " "
+  CONFIG["COMMON_HEADERS"] = "winsock2.h windows.h"
+  CONFIG["COMMON_MACROS"] = ""
+  CONFIG["COMMON_LIBS"] = "m"
+  CONFIG["MAINLIBS"] = ""
+  CONFIG["ENABLE_SHARED"] = "yes"
+  CONFIG["DLDLIBS"] = ""
+  CONFIG["SOLIBS"] = "$(LIBS)"
+  CONFIG["LIBRUBYARG_SHARED"] = "-l$(RUBY_SO_NAME)"
+  CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static"
+  CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)"
+  CONFIG["LIBRUBY"] = "lib$(RUBY_SO_NAME).dll.a"
+  CONFIG["LIBRUBY_ALIASES"] = ""
+  CONFIG["LIBRUBY_SO"] = "$(RUBY_SO_NAME).dll"
+  CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a"
+  CONFIG["RUBYW_INSTALL_NAME"] = "$(RUBYW_BASE_NAME)"
+  CONFIG["rubyw_install_name"] = "$(RUBYW_INSTALL_NAME)"
+  CONFIG["EXTDLDFLAGS"] = ""
+  CONFIG["EXTLDFLAGS"] = ""
+  CONFIG["strict_warnflags"] = ""
+  CONFIG["warnflags"] = "-Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration"
+  CONFIG["debugflags"] = "-g"
+  CONFIG["optflags"] = "-IC:/tools/pl-build-tools/include -IC:/tools/mingw64/include -IC:/ProgramFiles64Folder/PuppetLabs/Puppet/puppet/include -O3 -fno-omit-frame-pointer -fno-fast-math"
+  CONFIG["cxxflags"] = " $(optflags) $(debugflags) $(warnflags)"
+  CONFIG["cflags"] = " $(optflags) $(debugflags) $(warnflags)"
+  CONFIG["cppflags"] = ""
+  CONFIG["NULLCMD"] = ":"
+  CONFIG["DLNOBJ"] = "dln.o"
+  CONFIG["INSTALLDOC"] = "nodoc"
+  CONFIG["CAPITARGET"] = "nodoc"
+  CONFIG["RDOCTARGET"] = "nodoc"
+  CONFIG["DTRACE_GLOMMED_OBJ"] = ""
+  CONFIG["DTRACE_OBJ"] = ""
+  CONFIG["DTRACE_EXT"] = "dmyh"
+  CONFIG["EXECUTABLE_EXTS"] = ".exe .com .cmd .bat"
+  CONFIG["ARCHFILE"] = ""
+  CONFIG["LIBRUBY_RELATIVE"] = "yes"
+  CONFIG["EXTOUT"] = ".ext"
+  CONFIG["RUNRUBY_COMMAND"] = "$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)"
+  CONFIG["PREP"] = "miniruby$(EXEEXT)"
+  CONFIG["BTESTRUBY"] = "$(MINIRUBY)"
+  CONFIG["CROSS_COMPILING"] = "no"
+  CONFIG["TEST_RUNNABLE"] = "yes"
+  CONFIG["rubylibprefix"] = "$(libdir)/$(RUBY_BASE_NAME)"
+  CONFIG["setup"] = "Setup"
+  CONFIG["EXTSTATIC"] = ""
+  CONFIG["STRIP"] = "strip"
+  CONFIG["TRY_LINK"] = ""
+  CONFIG["LIBPATHENV"] = ""
+  CONFIG["RPATHFLAG"] = ""
+  CONFIG["LIBPATHFLAG"] = " -L%s"
+  CONFIG["LINK_SO"] = ""
+  CONFIG["LIBEXT"] = "a"
+  CONFIG["DLEXT2"] = ""
+  CONFIG["DLEXT"] = "so"
+  CONFIG["LDSHAREDXX"] = "$(CXX) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)"
+  CONFIG["LDSHARED"] = "$(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)"
+  CONFIG["CCDLFLAGS"] = ""
+  CONFIG["STATIC"] = ""
+  CONFIG["ARCH_FLAG"] = ""
+  CONFIG["DLDFLAGS"] = " -Wl,--enable-auto-image-base,--enable-auto-import -LC/lib -L/ProgramFiles64Folder/PuppetLabs/Puppet/puppet/lib  $(DEFFILE)"
+  CONFIG["ALLOCA"] = ""
+  CONFIG["codesign"] = ""
+  CONFIG["POSTLINK"] = ":"
+  CONFIG["WERRORFLAG"] = "-Werror"
+  CONFIG["CHDIR"] = "cd -P"
+  CONFIG["RMALL"] = "rm -fr"
+  CONFIG["RMDIRS"] = "rmdir --ignore-fail-on-non-empty -p"
+  CONFIG["RMDIR"] = "rmdir --ignore-fail-on-non-empty"
+  CONFIG["CP"] = "cp"
+  CONFIG["RM"] = "rm -f"
+  CONFIG["PKG_CONFIG"] = ""
+  CONFIG["PYTHON"] = ""
+  CONFIG["DOXYGEN"] = ""
+  CONFIG["DOT"] = ""
+  CONFIG["DTRACE"] = ""
+  CONFIG["MAKEDIRS"] = "/bin/mkdir -p"
+  CONFIG["MKDIR_P"] = "/bin/mkdir -p"
+  CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644"
+  CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)"
+  CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)"
+  CONFIG["SET_MAKE"] = ""
+  CONFIG["LN_S"] = "ln -s"
+  CONFIG["NM"] = "nm"
+  CONFIG["DLLWRAP"] = "dllwrap"
+  CONFIG["WINDRES"] = "windres"
+  CONFIG["OBJCOPY"] = ":"
+  CONFIG["OBJDUMP"] = "objdump"
+  CONFIG["ASFLAGS"] = ""
+  CONFIG["AS"] = "as"
+  CONFIG["AR"] = "ar"
+  CONFIG["RANLIB"] = "ranlib"
+  CONFIG["try_header"] = ""
+  CONFIG["CC_VERSION"] = "$(CC) -v"
+  CONFIG["COUTFLAG"] = "-o "
+  CONFIG["OUTFLAG"] = "-o "
+  CONFIG["CPPOUTFILE"] = "-o conftest.i"
+  CONFIG["GNU_LD"] = "no"
+  CONFIG["LD"] = "ld"
+  CONFIG["GCC"] = "yes"
+  CONFIG["EGREP"] = "/bin/grep -E"
+  CONFIG["GREP"] = "/bin/grep"
+  CONFIG["CPP"] = "$(CC) -E"
+  CONFIG["CXXFLAGS"] = "$(cxxflags)"
+  CONFIG["CXX"] = "x86_64-w64-mingw32-g++"
+  CONFIG["OBJEXT"] = "o"
+  CONFIG["CPPFLAGS"] = "-DFD_SETSIZE=2048 -IC/include -I/ProgramFiles64Folder/PuppetLabs/Puppet/puppet/include -D_WIN32_WINNT=0x0501 -D__MINGW_USE_VC2005_COMPAT $(DEFS) $(cppflags)"
+  CONFIG["LDFLAGS"] = "-L. -LC:/tools/pl-build-tools/lib -LC:/tools/mingw64/lib -LC:/ProgramFiles64Folder/PuppetLabs/Puppet/sys/ruby/lib -LC/lib -L/ProgramFiles64Folder/PuppetLabs/Puppet/puppet/lib "
+  CONFIG["CFLAGS"] = "$(cflags)"
+  CONFIG["CC"] = "x86_64-w64-mingw32-gcc"
+  CONFIG["NACL_SDK_VARIANT"] = ""
+  CONFIG["NACL_SDK_ROOT"] = ""
+  CONFIG["NACL_TOOLCHAIN"] = ""
+  CONFIG["target_os"] = "mingw32"
+  CONFIG["target_vendor"] = "w64"
+  CONFIG["target_cpu"] = "x64"
+  CONFIG["target"] = "x86_64-w64-mingw32"
+  CONFIG["host_os"] = "mingw32"
+  CONFIG["host_vendor"] = "w64"
+  CONFIG["host_cpu"] = "x86_64"
+  CONFIG["host"] = "x86_64-w64-mingw32"
+  CONFIG["RUBY_VERSION_NAME"] = "$(RUBY_BASE_NAME)-$(ruby_version)"
+  CONFIG["RUBYW_BASE_NAME"] = "rubyw"
+  CONFIG["RUBY_BASE_NAME"] = "ruby"
+  CONFIG["build_os"] = "mingw32"
+  CONFIG["build_vendor"] = "unknown"
+  CONFIG["build_cpu"] = "x86_64"
+  CONFIG["build"] = "x86_64-unknown-cygwin"
+  CONFIG["RUBY_RELEASE_DATE"] = "2016-03-30"
+  CONFIG["RUBY_PROGRAM_VERSION"] = "2.1.9"
+  CONFIG["target_alias"] = ""
+  CONFIG["host_alias"] = "x86_64-w64-mingw32"
+  CONFIG["build_alias"] = ""
+  CONFIG["LIBS"] = "-lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi "
+  CONFIG["ECHO_T"] = ""
+  CONFIG["ECHO_N"] = "-n"
+  CONFIG["ECHO_C"] = ""
+  CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64"
+  CONFIG["mandir"] = "$(datarootdir)/man"
+  CONFIG["localedir"] = "$(datarootdir)/locale"
+  CONFIG["libdir"] = "$(exec_prefix)/lib"
+  CONFIG["psdir"] = "$(docdir)"
+  CONFIG["pdfdir"] = "$(docdir)"
+  CONFIG["dvidir"] = "$(docdir)"
+  CONFIG["htmldir"] = "$(docdir)"
+  CONFIG["infodir"] = "$(datarootdir)/info"
+  CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)"
+  CONFIG["oldincludedir"] = "/usr/include"
+  CONFIG["includedir"] = "$(prefix)/include"
+  CONFIG["localstatedir"] = "$(prefix)/var"
+  CONFIG["sharedstatedir"] = "$(prefix)/com"
+  CONFIG["sysconfdir"] = "$(prefix)/etc"
+  CONFIG["datadir"] = "$(datarootdir)"
+  CONFIG["datarootdir"] = "$(prefix)/share"
+  CONFIG["libexecdir"] = "$(exec_prefix)/libexec"
+  CONFIG["sbindir"] = "$(exec_prefix)/sbin"
+  CONFIG["bindir"] = "$(exec_prefix)/bin"
+  CONFIG["exec_prefix"] = "$(prefix)"
+  CONFIG["PACKAGE_URL"] = ""
+  CONFIG["PACKAGE_BUGREPORT"] = ""
+  CONFIG["PACKAGE_STRING"] = ""
+  CONFIG["PACKAGE_VERSION"] = ""
+  CONFIG["PACKAGE_TARNAME"] = ""
+  CONFIG["PACKAGE_NAME"] = ""
+  CONFIG["PATH_SEPARATOR"] = ":"
+  CONFIG["SHELL"] = "/bin/sh"
+  CONFIG["archdir"] = "$(rubyarchdir)"
+  CONFIG["topdir"] = File.dirname(__FILE__)
+  MAKEFILE_CONFIG = {}
+  CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
+  def RbConfig::expand(val, config = CONFIG)
+    newval = val.gsub(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) {
+      var = $&
+      if !(v = $1 || $2)
+	'$'
+      elsif key = config[v = v[/\A[^:]+(?=(?::(.*?)=(.*))?\z)/]]
+	pat, sub = $1, $2
+	config[v] = false
+	config[v] = RbConfig::expand(key, config)
+	key = key.gsub(/#{Regexp.quote(pat)}(?=\s|\z)/n) {sub} if pat
+	key
+      else
+	var
+      end
+    }
+    val.replace(newval) unless newval == val
+    val
+  end
+  CONFIG.each_value do |val|
+    RbConfig::expand(val)
+  end
+
+  # returns the absolute pathname of the ruby command.
+  def RbConfig.ruby
+    File.join(
+      RbConfig::CONFIG["bindir"],
+      RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
+    )
+  end
+end
+autoload :Config, "rbconfig/obsolete.rb" # compatibility for ruby-1.8.4 and older.
+CROSS_COMPILING = nil unless defined? CROSS_COMPILING
