[DRE-commits] [ruby-dep-selector] 07/17: Patch: do not require dep-selector-libgecode

[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 0e1d9dd34a032e737b92c325abb2ceb7a3d8e8e0
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Thu Jun 25 11:56:08 2015 +0300

    Patch: do not require dep-selector-libgecode
---
 ...001-Do-not-require-dep-selector-libgecode.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 38 insertions(+)

diff --git a/debian/patches/0001-Do-not-require-dep-selector-libgecode.patch b/debian/patches/0001-Do-not-require-dep-selector-libgecode.patch
new file mode 100644
index 0000000..6e60987
--- /dev/null
+++ b/debian/patches/0001-Do-not-require-dep-selector-libgecode.patch
@@ -0,0 +1,37 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 25 Jun 2015 11:55:08 +0300
+Subject: Do not require dep-selector-libgecode
+
+---
+ ext/dep_gecode/extconf.rb | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/ext/dep_gecode/extconf.rb b/ext/dep_gecode/extconf.rb
+index d14b856..208054b 100644
+--- a/ext/dep_gecode/extconf.rb
++++ b/ext/dep_gecode/extconf.rb
+@@ -24,10 +24,9 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
+   # ./configure --with-architectures=i386,x86_64
+   # to work properly here.
+   require 'mkmf'
+-  require 'dep-selector-libgecode'
+ 
+-  opt_path = DepSelectorLibgecode.opt_path
+-  include_path = DepSelectorLibgecode.include_path
++  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
+@@ -130,9 +129,8 @@ else # JRUBY
+   incflags = "-I."
+   libpath = "-L."
+ 
+-  require 'dep-selector-libgecode'
+-  opt_path = DepSelectorLibgecode.opt_path
+-  include_path = DepSelectorLibgecode.include_path
++  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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a40379e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Do-not-require-dep-selector-libgecode.patch

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