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

ruby-changes:17633

From: nobu <ko1@a...>
Date: Sat, 30 Oct 2010 11:34:08 +0900 (JST)
Subject: [ruby-changes:17633] Ruby:r29641 (trunk): * win32/Makefile.sub (ruby_pc): ignore missing variables.

nobu	2010-10-30 11:33:59 +0900 (Sat, 30 Oct 2010)

  New Revision: 29641

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

  Log:
    * win32/Makefile.sub (ruby_pc): ignore missing variables.
    
    * template/ruby.pc.in: add missing variables for mswin.

  Modified files:
    trunk/ChangeLog
    trunk/template/ruby.pc.in
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29640)
+++ ChangeLog	(revision 29641)
@@ -1,3 +1,9 @@
+Sat Oct 30 11:33:54 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/Makefile.sub (ruby_pc): ignore missing variables.
+
+	* template/ruby.pc.in: add missing variables for mswin.
+
 Sat Oct 30 10:24:35 2010  Marc-Andre Lafortune  <ruby-core@m...>
 
 	* object.c: Make BasicObject.new accept no parameter.
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 29640)
+++ win32/Makefile.sub	(revision 29641)
@@ -899,9 +899,10 @@
 <<KEEP
 
 $(ruby_pc): $(RBCONFIG)
-	@$(MINIRUBY) -rrbconfig -p \
+	@$(MINIRUBY) -r./rbconfig -p \
+	-e 'STDOUT.binmode' \
 	-e '$$_.gsub!(/@([a-z_]\w*)@/i) {' \
-	-e 'RbConfig::MAKEFILE_CONFIG[$$1].gsub(/\$$\((.+?)\)/, %Q[$${\1}])'
+	-e '(RbConfig::MAKEFILE_CONFIG[$$1] or "").gsub(/\$$\((.+?)\)/, %Q[$${\\1}])' \
 	-e '}' \
 	$(srcdir)/template/ruby.pc.in > $@
 
Index: template/ruby.pc.in
===================================================================
--- template/ruby.pc.in	(revision 29640)
+++ template/ruby.pc.in	(revision 29641)
@@ -11,6 +11,10 @@
 RUBY_BASE_NAME=@RUBY_BASE_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
+LIBPATH=@LIBPATH@
+LIBRUBY=@LIBRUBY@
+LIBRUBY_A=@LIBRUBY_A@
+LIBRUBY_SO=@LIBRUBY_SO@
 LIBRUBYARG_SHARED=@LIBRUBYARG_SHARED@
 LIBRUBYARG_STATIC=@LIBRUBYARG_STATIC@
 LIBRUBYARG=@LIBRUBYARG@

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

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