From bafe6d850499ad30c4fd21fac6036cb7b5cae2d3 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 9 Jan 2004 02:20:28 +0000
Subject: [PATCH] * ext/extmk.rb (extmake): should not reduce necessary
 libraries.   [ruby-dev:22440]

* lib/mkmf.rb (merge_libs): merge libraries according to
  dependency.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |  8 ++++++++
 ext/extmk.rb |  2 +-
 lib/mkmf.rb  | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 551f825450..6029212b87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Jan  9 11:20:24 2004  Siena.  <siena@faculty.chiba-u.jp>
+
+	* ext/extmk.rb (extmake): should not reduce necessary libraries.
+	  [ruby-dev:22440]
+
+	* lib/mkmf.rb (merge_libs): merge libraries according to
+	  dependency.
+
 Fri Jan  9 10:05:23 2004  Siena.  <siena@faculty.chiba-u.jp>
 
 	* lib/mkmf.rb (libpathflag): use single quotes.  [ruby-dev:22440]
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 21d82ff32b..04d559a54e 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -109,7 +109,7 @@ def extmake(target)
       $extpath ||= []
       $extflags += " " + $DLDFLAGS unless $DLDFLAGS.empty?
       $extflags += " " + $LDFLAGS unless $LDFLAGS.empty?
-      $extlibs |= $libs.split | $LOCAL_LIBS.split
+      $extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split)
       $extpath |= $LIBPATH
     end
   ensure
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 17579ec01d..ab1bea1b59 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -113,6 +113,21 @@ def modified?(target, times)
   t if times.all? {|n| n <= t}
 end
 
+def merge_libs(*libs)
+  libs.inject([]) do |x, y|
+    xy = x & y
+    xn = yn = 0
+    y.each_with_index do |v, yi|
+      if xy.include?(v)
+        xi = [x.index(v), xn].max()
+        x[xi, 1] = y[yn..yi]
+        xn, yn = xi + (yi - yn + 1), yi + 1
+      end
+    end
+    x.concat(y[yn..-1] || [])
+  end
+end
+
 module Logging
   @log = nil
   @logfile = 'mkmf.log'