nagachika	2014-09-15 01:13:47 +0900 (Mon, 15 Sep 2014)

  New Revision: 47587

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

  Log:
    merge revision(s) r47457: [Backport #8315]
    
    * lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also
      $CXXFLAGS, as they are often used by C++ compiler.
      [ruby-core:54532] [Bug #8315]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/mkmf.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47586)
+++ ruby_2_1/ChangeLog	(revision 47587)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Sep 15 01:06:35 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also
+	  $CXXFLAGS, as they are often used by C++ compiler.
+	  [ruby-core:54532] [Bug #8315]
+
 Mon Sep 15 00:02:20 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/csv.rb (CSV#<<): honor explicitly given encoding.  based on
Index: ruby_2_1/lib/mkmf.rb
===================================================================
--- ruby_2_1/lib/mkmf.rb	(revision 47586)
+++ ruby_2_1/lib/mkmf.rb	(revision 47587)
@@ -1764,6 +1764,7 @@ SRC https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/mkmf.rb#L1764
       libs = get['libs-only-l']
       ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
       $CFLAGS += " " << cflags
+      $CXXFLAGS += " " << cflags
       $LDFLAGS = [orig_ldflags, ldflags].join(' ')
       $libs += " " << libs
       Logging::message "package configuration for %s\n", pkg
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47586)
+++ ruby_2_1/version.h	(revision 47587)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-09-15"
-#define RUBY_PATCHLEVEL 236
+#define RUBY_PATCHLEVEL 237
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47457


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