nobu	2012-11-23 23:44:45 +0900 (Fri, 23 Nov 2012)

  New Revision: 37820

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37820

  Log:
    mkmf.rb: mingw64+MSYS pkg-config fix
    
    * lib/mkmf.rb (MakeMakefile#pkg_config): strip all white spaces for
      mingw64+MSYS pkg-config which errouneously emits extra newlines.
      [ruby-core:47998] [Bug #7163]

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37819)
+++ ChangeLog	(revision 37820)
@@ -1,3 +1,9 @@
+Fri Nov 23 23:44:41 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (MakeMakefile#pkg_config): strip all white spaces for
+	  mingw64+MSYS pkg-config which errouneously emits extra newlines.
+	  [ruby-core:47998] [Bug #7163]
+
 Fri Nov 23 17:31:54 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (usage): wrap description lines if options are too long.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 37819)
+++ lib/mkmf.rb	(revision 37820)
@@ -1,3 +1,4 @@
+# -*- coding: us-ascii -*-
 # module to create Makefile for extension modules
 # invoke like: ruby -r mkmf extconf.rb
 
@@ -1668,16 +1669,16 @@
   def pkg_config(pkg)
     if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
       # iff package specific config command is given
-      get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp}
+      get = proc {|opt| `#{pkgconfig} --#{opt}`.strip}
     elsif ($PKGCONFIG ||=
            (pkgconfig = with_config("pkg-config", ("pkg-config" unless CROSS_COMPILING))) &&
            find_executable0(pkgconfig) && pkgconfig) and
         system("#{$PKGCONFIG} --exists #{pkg}")
       # default to pkg-config command
-      get = proc {|opt| `#{$PKGCONFIG} --#{opt} #{pkg}`.chomp}
+      get = proc {|opt| `#{$PKGCONFIG} --#{opt} #{pkg}`.strip}
     elsif find_executable0(pkgconfig = "#{pkg}-config")
       # default to package specific config command, as a last resort.
-      get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp}
+      get = proc {|opt| `#{pkgconfig} --#{opt}`.strip}
     end
     if get and try_ldflags(ldflags = get['libs'])
       cflags = get['cflags']

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/