[DRE-commits] [SCM] ruby-mkrf.git branch, master, updated. debian/0.2.3+dfsg-1-8-ged50347

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit ed503474bce8818368611c331c160549dfdee7e0
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue Sep 4 13:21:04 2012 +0200

    add 0700_fix_link_command_order.patch (Closes: #684198

diff --git a/debian/changelog b/debian/changelog
index 70a2720..0e2ae17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-mkrf (0.2.3+dfsg-3) unstable; urgency=low
+
+  * Add 0700_fix_link_command_order.patch, solving FTBFS with --as-needed
+    linker flag. Thanks Felix Geyer for the patch (Closes: #684198).
+
+ -- Cédric Boutillier <cedric.boutillier at gmail.com>  Tue, 04 Sep 2012 11:56:34 +0200
+
 ruby-mkrf (0.2.3+dfsg-2) unstable; urgency=low
 
   * Add 0400_use_correct_ruby_version_in_tests.patch:
diff --git a/debian/patches/0700_fix_link_command_order.patch b/debian/patches/0700_fix_link_command_order.patch
new file mode 100644
index 0000000..05662f6
--- /dev/null
+++ b/debian/patches/0700_fix_link_command_order.patch
@@ -0,0 +1,19 @@
+Description: Fix link command order so it works with ld --as-needed.
+Author: Felix Geyer <debfx at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684198
+
+--- ruby-mkrf-0.2.3+dfsg.orig/lib/mkrf/availability.rb
++++ ruby-mkrf-0.2.3+dfsg/lib/mkrf/availability.rb
+@@ -279,9 +279,9 @@ module Mkrf
+     def link_command
+       # This current implementation just splats the library_paths in
+       # unconditionally.  Is this problematic?
+-      "#{@compiler} -o #{TEMP_EXECUTABLE} #{library_paths_compile_string}" +
+-      " #{library_compile_string} #{includes_compile_string}" +
+-      " #{TEMP_SOURCE_FILE}"
++      "#{@compiler} -o #{TEMP_EXECUTABLE}" +
++      " #{includes_compile_string} #{TEMP_SOURCE_FILE}" + 
++      " #{library_paths_compile_string} #{library_compile_string}"
+     end
+ 
+     # Creates a temporary source file with the string passed
diff --git a/debian/patches/series b/debian/patches/series
index cb8c729..0769705 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,5 @@
 0500_replace_config_by_rbconfig.patch
 0600_fix_test_libxml.patch
 0610_fix_test_syck.patch
+0700_fix_link_command_order.patch
 9900_debug_test_failures.patch

-- 
ruby-mkrf.git