[root-system] 15/21: Fix Ruby header directory.

[Lifeng Sun]

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

lifengsun-guest pushed a commit to branch master
in repository root-system.

commit 9e6206f971e05a7a6c195351d2a21572868d7df8
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sun Jul 13 13:57:13 2014 +0800

    Fix Ruby header directory.
---
 debian/changelog                         |  1 +
 debian/patches/77-ruby-header-path.patch | 11 +++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9765de7..5a1283c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ root-system (5.34.19+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Remove non-free font file. (Closes: #733285)
+  * Fix Ruby header directory. (Closes: #739775)
 
  -- Lifeng Sun <lifongsun at gmail.com>  Sun, 13 Jul 2014 09:43:47 +0800
 
diff --git a/debian/patches/77-ruby-header-path.patch b/debian/patches/77-ruby-header-path.patch
new file mode 100644
index 0000000..68feab8
--- /dev/null
+++ b/debian/patches/77-ruby-header-path.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -4690,7 +4690,7 @@
+         /usr/local/include/ruby /usr/include/ruby
+     rubyinc=$found_hdr
+     rubyincdir=$found_dir
+-    check_header "ruby/config.h" "" $rubysysincdir/$rubysysarch
++    check_header "ruby/config.h" "" `ruby -rrbconfig -e 'print RbConfig::CONFIG["rubyarchhdrdir"]'`
+     if test "x$found_hdr" != "x" ; then
+         rubyincdir="$rubyincdir $found_dir"
+     fi
diff --git a/debian/patches/series b/debian/patches/series
index 7adbed5..7698ea8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@
 74-kfreebsd.patch
 75-hardening-flag.patch
 76-hurd-i386.patch
+77-ruby-header-path.patch
diff --git a/debian/rules b/debian/rules
index b39db2f..d5beca6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -238,7 +238,7 @@ IPKGOPTS	:= $(IPKGLIST:%=-p%)
 PKGOPTS		:= $(IPKGOPTS) $(SPKGOPTS)
 HAVERUBY	:= $(filter libroot-bindings-ruby, $(PKGLIST))
 ifeq ($(HAVERUBY), libroot-bindings-ruby)
-RUBYARCHDIR	:= $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]' | sed 's,/,,')
+RUBYARCHDIR	:= $(shell ruby -rrbconfig -e 'print RbConfig::CONFIG["rubyarchhdrdir"]' | sed 's,/,,')
 else
 RUBYARCHDIR	:= 
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/root-system.git