nagachika	2015-07-04 05:13:46 +0900 (Sat, 04 Jul 2015)

  New Revision: 51135

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

  Log:
    merge revision(s) 50717: [Backport #11201]
    
    * lib/mkmf.rb (pkg_config): split --libs if --libs-only-l option
      is not available.  patch in [ruby-core:69428] by Hans Mackowiak.
      [ruby-core:69421] [Bug #11201]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/mkmf.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 51134)
+++ ruby_2_2/ChangeLog	(revision 51135)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sat Jul  4 05:00:48 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (pkg_config): split --libs if --libs-only-l option
+	  is not available.  patch in [ruby-core:69428] by Hans Mackowiak.
+	  [ruby-core:69421] [Bug #11201]
+
 Sat Jul  4 04:46:51 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (iseq_compile_each): out of range NTH_REF is always
Index: ruby_2_2/lib/mkmf.rb
===================================================================
--- ruby_2_2/lib/mkmf.rb	(revision 51134)
+++ ruby_2_2/lib/mkmf.rb	(revision 51135)
@@ -1785,11 +1785,18 @@ SRC https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/mkmf.rb#L1785
         cflags = get['cflags']
       end
       libs = get['libs-only-l']
-      ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
-      $CFLAGS += " " << cflags
-      $CXXFLAGS += " " << cflags
-      $LDFLAGS = [orig_ldflags, ldflags].join(' ')
+      if cflags
+        $CFLAGS += " " << cflags
+        $CXXFLAGS += " " << cflags
+      end
+      if libs
+        ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
+      else
+        libs, ldflags = Shellwords.shellwords(ldflags).partition {|s| s =~ /-l([^ ]+)/ }.map {|l|l.quote.join(" ")}
+      end
       $libs += " " << libs
+
+      $LDFLAGS = [orig_ldflags, ldflags].join(' ')
       Logging::message "package configuration for %s\n", pkg
       Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n",
                        cflags, ldflags, libs
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 51134)
+++ ruby_2_2/version.h	(revision 51135)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.3"
 #define RUBY_RELEASE_DATE "2015-07-04"
-#define RUBY_PATCHLEVEL 145
+#define RUBY_PATCHLEVEL 146
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50717


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