[DRE-commits] [ruby-dep-selector] 09/17: Patch: do not set rpath

[Hleb Valoshka]

This is an automated email from the git hooks/post-receive script.

tsfgnu-guest pushed a commit to branch master
in repository ruby-dep-selector.

commit b24b7c36f7d5b58fd36ac7a8c855660c907ec85e
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Thu Jun 25 18:11:23 2015 +0300

    Patch: do not set rpath
---
 debian/patches/0003-Do-not-set-rpath.patch | 47 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 2 files changed, 48 insertions(+)

diff --git a/debian/patches/0003-Do-not-set-rpath.patch b/debian/patches/0003-Do-not-set-rpath.patch
new file mode 100644
index 0000000..e0ba6bb
--- /dev/null
+++ b/debian/patches/0003-Do-not-set-rpath.patch
@@ -0,0 +1,47 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 25 Jun 2015 18:08:20 +0300
+Subject: Do not set rpath
+
+---
+ ext/dep_gecode/extconf.rb | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/ext/dep_gecode/extconf.rb b/ext/dep_gecode/extconf.rb
+index 208054b..684f016 100644
+--- a/ext/dep_gecode/extconf.rb
++++ b/ext/dep_gecode/extconf.rb
+@@ -27,20 +27,6 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
+ 
+   opt_path = "/usr/lib/#{`dpkg-architecture -qDEB_TARGET_MULTIARCH`}"
+   include_path = '/usr/include'
+-  if find_library("gecodesupport", nil, opt_path)
+-
+-    # Ruby sometimes has a blank RPATHFLAG, even though it's on a system that
+-    # really should be setting rpath flags. If there _is_ an rpath flag we'll
+-    # honor it, but if not, we'll assume that ruby is lying and set it
+-    # ourselves.
+-    #
+-    # See also: https://github.com/opscode/dep-selector/issues/23
+-    ruby_rpathflag = RbConfig::MAKEFILE_CONFIG["RPATHFLAG"]
+-    if ruby_rpathflag.nil? || ruby_rpathflag.empty?
+-      hax_rpath_flags = " -Wl,-rpath,%1$-s" % [opt_path]
+-      $DLDFLAGS << hax_rpath_flags
+-    end
+-  end
+   # find_header doesn't seem to work for stuff like `gecode/thing.hh`
+   $INCFLAGS << " -I#{include_path}"
+ 
+@@ -132,13 +118,6 @@ else # JRUBY
+   opt_path = "/usr/lib/#{`dpkg-architecture -qDEB_TARGET_MULTIARCH`}"
+   include_path = '/usr/include'
+   libpath << " -L#{opt_path}"
+-
+-  # On MRI, RbConfig::CONFIG["RPATHFLAG"] == "" when using clang/llvm, but this
+-  # isn't set on JRuby so we need to detect llvm manually and set rpath on gcc
+-  unless `gcc -v` =~ /LLVM/
+-    rpath_flag = (" -Wl,-R%1$-s" % [opt_path])
+-    libpath << rpath_flag
+-  end
+   incflags << " -I#{include_path}"
+ 
+   cflags = ENV['CFLAGS']
diff --git a/debian/patches/series b/debian/patches/series
index 367abf6..5646697 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Do-not-require-dep-selector-libgecode.patch
 0002-Port-to-libgecode-4.0-Closes-710104.patch
+0003-Do-not-set-rpath.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-dep-selector.git