usa	2014-09-17 15:03:36 +0900 (Wed, 17 Sep 2014)

  New Revision: 47609

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

  Log:
    merge revision(s) 44459,44470,47457: [Backport #8315]
    
    * lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
      Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]
    
    * 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_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/mkmf.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 47608)
+++ ruby_2_0_0/ChangeLog	(revision 47609)
@@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Sep 17 14:58:50 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]
+
+Wed Sep 17 14:58:50 2014  Shota Fukumori  <her@s...>
+
+	* lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
+	  Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]
+
 Wed Sep 17 14:52:38 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/csv.rb (CSV#<<): honor explicitly given encoding.  based on
Index: ruby_2_0_0/lib/mkmf.rb
===================================================================
--- ruby_2_0_0/lib/mkmf.rb	(revision 47608)
+++ ruby_2_0_0/lib/mkmf.rb	(revision 47609)
@@ -1727,6 +1727,7 @@ SRC https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/mkmf.rb#L1727
       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
@@ -1859,7 +1860,7 @@ CFLAGS   = $(CCDLFLAGS) #$CFLAGS $(ARCH_ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/mkmf.rb#L1860
 INCFLAGS = -I. #$INCFLAGS
 DEFS     = #{CONFIG['DEFS']}
 CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
-CXXFLAGS = $(CCDLFLAGS) #{CONFIG['CXXFLAGS']} $(ARCH_FLAG)
+CXXFLAGS = $(CCDLFLAGS) #$CXXFLAGS $(ARCH_FLAG)
 ldflags  = #{$LDFLAGS}
 dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']}
 ARCH_FLAG = #{$ARCH_FLAG}
@@ -2339,6 +2340,7 @@ site-install-rb: install-rb https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/mkmf.rb#L2340
       $warnflags = config['warnflags'] unless $extmk
     end
     $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup
+    $CXXFLAGS = (with_config("cxxflags", arg_config("CXXFLAGS", config["CXXFLAGS"]))||'').dup
     $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
     $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
     $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 47608)
+++ ruby_2_0_0/version.h	(revision 47609)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-09-17"
-#define RUBY_PATCHLEVEL 571
+#define RUBY_PATCHLEVEL 572
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44459,44470,47457


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