From 3cb22b4c0a95e2a183f879424bf4b3527ab61249 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 2 Sep 2004 16:54:53 +0000
Subject: * ext/extmk.rb: already built-in libraries satisfy dependencies.  
 [ruby-dev:24028]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 5 +++++
 ext/extmk.rb | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ca7f6924c..ccce45eed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep  3 01:54:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: already built-in libraries satisfy dependencies.
+	  [ruby-dev:24028]
+
 Thu Sep  2 11:36:20 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* eval.c (rb_obj_instance_eval): backported from HEAD.
diff --git a/ext/extmk.rb b/ext/extmk.rb
index ec7ae3234..618ef328c 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -233,9 +233,10 @@ if $extlist.size > 0
   $extinit ||= ""
   $extobjs ||= ""
   list = $extlist.dup
+  built = []
   while e = list.shift
     s,t,i,r = e
-    if r and !r.empty?
+    if r and !(r -= built).empty?
       l = list.size
       if (while l > 0; break true if r.include?(list[l-=1][1]) end)
         list.insert(l + 1, e)
@@ -246,6 +247,7 @@ if $extlist.size > 0
     if File.exist?(f)
       $extinit += "\tinit(Init_#{i}, \"#{t}.so\");\n"
       $extobjs += "ext/#{f} "
+      built << t
     end
   end
 
-- 
cgit