[前][次][番号順一覧][スレッド一覧]

ruby-changes:3078

From: ko1@a...
Date: 24 Dec 2007 11:56:56 +0900
Subject: [ruby-changes:3078] nobu - Ruby:r14570 (trunk, ruby_1_8): * common.mk: should not pass MAKEFLAGS to recursive make.

nobu	2007-12-24 11:56:33 +0900 (Mon, 24 Dec 2007)

  New Revision: 14570

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/bcc32/Makefile.sub
    branches/ruby_1_8/version.h
    branches/ruby_1_8/win32/Makefile.sub
    branches/ruby_1_8/wince/Makefile.sub
    trunk/ChangeLog
    trunk/bcc32/Makefile.sub
    trunk/common.mk
    trunk/win32/Makefile.sub
    trunk/wince/Makefile.sub

  Log:
    * common.mk: should not pass MAKEFLAGS to recursive make.
      + normal make: MFLAGS are set and command line options and macros
        are all passed silently.
      + GNU make: ditto, and all options and macros in MAKEFLAGS are in
        effect.
      + nmake: MFLAGS is not set and MAKEFLAGS has only options without
        hyphen, no macros exist in any variables.
      + Borland make: ditto, and command line macros cannot override
        macros in makefile, so passing them is vain.
    
    * {bcc32,win{32,ce}}/Makefile.sub (SET_MAKE): set MFLAGS which is not
      set by default, to get rid of chaotic situation of MFLAGS/MAKEFLAGS.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/wince/Makefile.sub?r1=14570&r2=14569
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/wince/Makefile.sub?r1=14570&r2=14569
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=14570&r2=14569
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14570&r2=14569
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/bcc32/Makefile.sub?r1=14570&r2=14569
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=14570&r2=14569
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/Makefile.sub?r1=14570&r2=14569
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/Makefile.sub?r1=14570&r2=14569
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=14570&r2=14569
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=14570&r2=14569

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14569)
+++ ChangeLog	(revision 14570)
@@ -1,3 +1,18 @@
+Mon Dec 24 11:56:31 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk: should not pass MAKEFLAGS to recursive make.
+	  + normal make: MFLAGS are set and command line options and macros
+	    are all passed silently.
+	  + GNU make: ditto, and all options and macros in MAKEFLAGS are in
+	    effect.
+	  + nmake: MFLAGS is not set and MAKEFLAGS has only options without
+	    hyphen, no macros exist in any variables.
+	  + Borland make: ditto, and command line macros cannot override
+	    macros in makefile, so passing them is vain.
+
+	* {bcc32,win{32,ce}}/Makefile.sub (SET_MAKE): set MFLAGS which is not
+	  set by default, to get rid of chaotic situation of MFLAGS/MAKEFLAGS.
+
 Mon Dec 24 11:32:44 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* string.c (rb_str_comparable): fixed to keep transitivity.
@@ -6,19 +21,19 @@
 Mon Dec 24 11:20:31 2007  Eric Hodel  <drbrain@s...>
 
 	* lib/rdoc/ri/ri_options.rb:  Fix display of GEMDIRS, make command
-	examples match ri's name.
+	  examples match ri's name.
 
 	* lib/rdoc/ri/ri_paths.rb:  Only allow latest ri dirs in ri output.
 
 Mon Dec 24 10:49:04 2007  Eric Hodel  <drbrain@s...>
 
 	* lib/uri/mailto.rb, lib/uri/common.rb:  Fix Regexp warnings.  Patch
-	#16524 from Kornelius Kalnbach, [ruby-core:14302].
+	  #16524 from Kornelius Kalnbach, [ruby-core:14302].
 
 Mon Dec 24 10:37:38 2007  Eric Hodel  <drbrain@s...>
 
 	* gem_prelude.rb:  Remove methods from Gem, not QuickLoader, to fix
-	warnings.
+	  warnings.
 
 Mon Dec 24 09:45:45 2007  Martin Duerst  <duerst@i...>
 
Index: common.mk
===================================================================
--- common.mk	(revision 14569)
+++ common.mk	(revision 14570)
@@ -342,7 +342,7 @@
 
 encs: enc.mk
 	$(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc"
-	$(MAKE) -f enc.mk $(MFLAGS) $(MAKEFLAGS)
+	$(MAKE) -f enc.mk $(MFLAGS)
 
 enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
 	$(srcdir)/lib/mkmf.rb $(RBCONFIG)
@@ -666,7 +666,7 @@
 	exit > $@
 
 $(srcdir)/ext/ripper/ripper.c:
-	cd $(srcdir)/ext/ripper && exec $(MAKE) -f depend $(MFLAGS) $(MAKEFLAGS) top_srcdir=../.. srcdir=.
+	cd $(srcdir)/ext/ripper && exec $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=.
 
 ##
 
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 14569)
+++ win32/Makefile.sub	(revision 14570)
@@ -429,7 +429,7 @@
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS),;t t
 s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
 s,@RM@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rm.bat,;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcpy.obj strlcat.obj win32.obj,;t t
Index: bcc32/Makefile.sub
===================================================================
--- bcc32/Makefile.sub	(revision 14569)
+++ bcc32/Makefile.sub	(revision 14570)
@@ -388,7 +388,7 @@
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS) ,;t t
 s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
 s,@RM@,$$(top_srcdir:/=\)\win32\rm.bat,;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcat.obj strlcpy.obj win32.obj,;t t
Index: wince/Makefile.sub
===================================================================
--- wince/Makefile.sub	(revision 14569)
+++ wince/Makefile.sub	(revision 14570)
@@ -383,7 +383,7 @@
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS),;t t
 s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
 s,@RM@,$$(top_srcdir:/=\)\win32\rm.bat,;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcat.obj strlcpy.obj win32.obj isinf.obj isnan.obj,;t t
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 14569)
+++ ruby_1_8/ChangeLog	(revision 14570)
@@ -1,3 +1,8 @@
+Mon Dec 24 11:56:31 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* {bcc32,win{32,ce}}/Makefile.sub (SET_MAKE): set MFLAGS which is not
+	  set by default, to get rid of chaotic situation of MFLAGS/MAKEFLAGS.
+
 Sat Dec 22 14:49:46 2007  Tadayoshi Funaba  <tadf@d...>
 
 	* lib/date.rb: don't freeze nil even if 1.8 will not be aware of
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 14569)
+++ ruby_1_8/version.h	(revision 14570)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-12-19"
+#define RUBY_RELEASE_DATE "2007-12-24"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071219
+#define RUBY_RELEASE_CODE 20071224
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 24
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/bcc32/Makefile.sub
===================================================================
--- ruby_1_8/bcc32/Makefile.sub	(revision 14569)
+++ ruby_1_8/bcc32/Makefile.sub	(revision 14570)
@@ -346,7 +346,7 @@
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS) ,;t t
 s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
Index: ruby_1_8/wince/Makefile.sub
===================================================================
--- ruby_1_8/wince/Makefile.sub	(revision 14569)
+++ ruby_1_8/wince/Makefile.sub	(revision 14570)
@@ -353,7 +353,7 @@
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS),;t t
 s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj isinf.obj isnan.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
Index: ruby_1_8/win32/Makefile.sub
===================================================================
--- ruby_1_8/win32/Makefile.sub	(revision 14569)
+++ ruby_1_8/win32/Makefile.sub	(revision 14570)
@@ -366,7 +366,7 @@
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS),;t t
 s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t

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

[前][次][番号順一覧][スレッド一覧]