[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-15-g9c9616e

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 9c9616ec6b7151bd8686a0b4e1b2c750ff2d2792
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jun 14 21:50:54 2012 +0800

    Improve ruby path handling.

diff --git a/debian/patches/73-ruby-1.9.1.patch b/debian/patches/73-ruby-1.9.1.patch
index e57b4f3..86c9582 100644
--- a/debian/patches/73-ruby-1.9.1.patch
+++ b/debian/patches/73-ruby-1.9.1.patch
@@ -15,7 +15,7 @@
          check_library_options="libruby-static libruby1.8-static libruby1.9-static"
      else
 -        check_library_options="libruby libruby1.8 libruby18 libruby1.9 libruby19"
-+        check_library_options="libruby-1.9.1"
++        check_library_options="libruby-1.9.1 libruby1.9 libruby19 libruby1.8 libruby18 libruby"
      fi
      check_library "$check_library_options" \
          "$enable_shared" "$rubylibdir" \
diff --git a/debian/rules b/debian/rules
index 15f58d3..a6f6baf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,10 +24,10 @@ LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
 EXTRA_CFLAGS   := $(CFLAGS)
 EXTRA_CXXFLAGS := $(CXXFLAGS)
 EXTRA_LDFLAGS  := $(LDFLAGS)
-RUBYARCHINC    := $(shell find /usr/include/ruby-1.9.1 -name config.h | xargs dirname | xargs dirname)
-
 export CPPFLAGS EXTRA_CFLAGS EXTRA_CXXFLAGS EXTRA_LDFLAGS RUBYARCHINC DEB_HOST_MULTIARCH
 
+RUBYHEADERDIR   := $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["rubyhdrdir"]')
+
 ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
 PLATFORM	= linux
 else
@@ -108,7 +108,7 @@ CONFOPTIONS	:=--enable-bonjour				\
 		  --with-globus=/usr				\
 		  --with-globus-incdir=/usr/include/globus	\
 		  --with-globus-libdir=/usr/lib			\
-		  --with-ruby-incdir=/usr/include/ruby-1.9.1	\
+		  --with-ruby-incdir=$(RUBYHEADERDIR)		\
 		  --with-pythia8-incdir=/usr/include/pythia8	\
 		  $(UNUR)					\
 		  $(XRD)					\
@@ -242,10 +242,15 @@ IPKGOPTS	:= $(IPKGLIST:%=-p%)
 PKGOPTS		:= $(IPKGOPTS) $(SPKGOPTS)
 HAVERUBY	:= $(filter libroot-bindings-ruby, $(PKGLIST))
 ifeq ($(HAVERUBY), libroot-bindings-ruby)
-RUBYARCHDIR	:= $(shell ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]' | sed 's,/,,')
+RUBYARCH        := $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["arch"]')
+RUBYARCHINC     := $(RUBYHEADERDIR)/$(RUBYARCH)
+RUBYARCHDIR	:= $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]' | sed 's,/,,')
 else
+RUBYARCHINC     :=
 RUBYARCHDIR	:= 
 endif
+export RUBYARCHINC
+
 HAVEPYTHON	:= $(filter libroot-bindings-python, $(PKGLIST))
 ifeq ($(HAVEPYTHON), libroot-bindings-python)
 PYVERS		:= $(shell pyversions -vs)

-- 
root-system: CERN's ROOT Data Analysis Framework