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

ruby-changes:29200

From: knu <ko1@a...>
Date: Wed, 12 Jun 2013 16:08:19 +0900 (JST)
Subject: [ruby-changes:29200] knu:r41252 (trunk): Update rdoc for pkg_config() and move :stopdoc: below to enable it.

knu	2013-06-12 16:08:08 +0900 (Wed, 12 Jun 2013)

  New Revision: 41252

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

  Log:
    Update rdoc for pkg_config() and move :stopdoc: below to enable it.

  Modified files:
    trunk/lib/mkmf.rb

Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 41251)
+++ lib/mkmf.rb	(revision 41252)
@@ -1715,8 +1715,6 @@ SRC https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1715
     [idir, ldir]
   end
 
-  # :stopdoc:
-
   # Returns compile/link information about an installed library in a
   # tuple of <code>[cflags, ldflags, libs]</code>, by using the
   # command found first in the following commands:
@@ -1730,8 +1728,12 @@ SRC https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1728
   #
   # Where {option} is, for instance, <code>--cflags</code>.
   #
+  # The values obtained are appended to +$CFLAGS+, +$LDFLAGS+ and
+  # +$libs+.
+  #
   # If an <code>option</code> argument is given, the config command is
-  # invoked with the option and a stripped output string is returned.
+  # invoked with the option and a stripped output string is returned
+  # without modifying any of the global values mentioned above.
   def pkg_config(pkg, option=nil)
     if pkgconfig = with_config("#{pkg}-config") and find_executable0(pkgconfig)
       # iff package specific config command is given
@@ -1765,6 +1767,8 @@ SRC https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1767
     end
   end
 
+  # :stopdoc:
+
   def with_destdir(dir)
     return dir unless $extmk
     dir = dir.sub($dest_prefix_pattern, '')

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

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