Package: ruby-dep-selector / 1.0.3-2

0003-Do-not-set-rpath.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
From: Hleb Valoshka <375gnu@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']