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

ruby-changes:29727

From: nobu <ko1@a...>
Date: Fri, 5 Jul 2013 00:30:01 +0900 (JST)
Subject: [ruby-changes:29727] nobu:r41779 (trunk): mkmf.rb: old syntax

nobu	2013-07-05 00:29:50 +0900 (Fri, 05 Jul 2013)

  New Revision: 41779

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

  Log:
    mkmf.rb: old syntax
    
    * lib/mkmf.rb (have_framework): get rid of newer syntax to run with
      ruby 1.8 for cross compiling.  [ruby-core:55745] [Bug #8593]

  Modified files:
    trunk/lib/mkmf.rb

Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 41778)
+++ lib/mkmf.rb	(revision 41779)
@@ -1084,8 +1084,12 @@ SRC https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L1084
   # If +fw+ is a pair of the framework name and its header file name
   # that header file is checked, instead of the normally used header
   # file which is named same as the framework.
-  def have_framework((fw, header), &b)
-    header ||= "#{fw}.h"
+  def have_framework(fw, &b)
+    if Array === fw
+      fw, header = *fw
+    else
+      header = "#{fw}.h"
+    end
     checking_for fw do
       src = cpp_include("#{fw}/#{header}") << "\n" "int main(void){return 0;}"
       opt = " -framework #{fw}"

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

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