[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-43-gab65ef3
Lifeng Sun
lifongsun at gmail.com
Wed Jun 27 16:11:48 UTC 2012
The following commit has been merged in the master branch:
commit 156a9905ac2fc5c8b821b9199bc4169b794516d1
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Wed Jun 27 12:31:29 2012 +0800
Improve ruby path handling.
Compatible with ubuntu.
diff --git a/debian/control b/debian/control
index 4c79181..ef8304f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Lifeng Sun <lifongsun at gmail.com>
DM-Upload-Allowed: yes
Homepage: http://root.cern.ch
-Build-Depends: debhelper (>= 5.0.37.2), lsb-release, autotools-dev, po-debconf, libssl-dev, comerr-dev, libxpm-dev, libltdl-dev, x11proto-xext-dev, libxext-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, liblzma-dev, python-dev (>= 2.1), graphviz, ttf-freefont, libncurses5-dev, libgraphviz-dev, libavahi-core-dev, libxft-dev, python-support (>= 0.3), ruby (>= 4.9), ruby1.9.1-dev | ruby-dev (>= 4.9), libglu1-mesa-dev| xlibmesa-glu-dev | libglu-dev, libglew1.5-dev | libglew-dev, libftgl-dev, libgl2ps-dev, libxml2-dev, libgsl0-dev, libavahi-compat-libdnssd-dev, libldap2-dev | libldap-dev, libxmlrpc-c3-dev | libxmlrpc-c-dev | libxmlrpc-core-c3-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, libjpeg-dev, libpng12-dev, libtiff4-dev, libafterimage-dev, libgif-dev, libxinerama-dev, libfftw3-dev | fftw3-dev, libpythia8-dev, libglobus-gss-assist-dev, libglobus-gsi-credential-dev, libglobus-common-dev, libglobus-gsi-sysconfig-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-callback-dev, libglobus-gsi-cert-utils-dev, libglobus-openssl-module-dev, libglobus-gsi-proxy-core-dev, libglobus-callout-dev, globus-proxy-utils,krb5-user|heimdal-clients, libmysqlclient-dev, libiodbc2-dev | unixodbc-dev, libpq-dev, gfortran|fortran-compiler, libqt4-dev (>= 4.3.0) | libqt3-mt-dev (>= 3.3.0), qt4-dev-tools (>= 4.3.0) | qt3-dev-tools (>= 3.3.0), libqt4-opengl-dev, libkrb5-dev|heimdal-dev
+Build-Depends: debhelper (>= 5.0.37.2), lsb-release, autotools-dev, po-debconf, libssl-dev, comerr-dev, libxpm-dev, libltdl-dev, x11proto-xext-dev, libxext-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, liblzma-dev, python-dev (>= 2.1), graphviz, ttf-freefont, libncurses5-dev, libgraphviz-dev, libavahi-core-dev, libxft-dev, python-support (>= 0.3), ruby, ruby-dev, libglu1-mesa-dev| xlibmesa-glu-dev | libglu-dev, libglew1.5-dev | libglew-dev, libftgl-dev, libgl2ps-dev, libxml2-dev, libgsl0-dev, libavahi-compat-libdnssd-dev, libldap2-dev | libldap-dev, libxmlrpc-c3-dev | libxmlrpc-c-dev | libxmlrpc-core-c3-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, libjpeg-dev, libpng12-dev, libtiff4-dev, libafterimage-dev, libgif-dev, libxinerama-dev, libfftw3-dev | fftw3-dev, libpythia8-dev, libglobus-gss-assist-dev, libglobus-gsi-credential-dev, libglobus-common-dev, libglobus-gsi-sysconfig-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-callback-dev, libglobus-gsi-cert-utils-dev, libglobus-openssl-module-dev, libglobus-gsi-proxy-core-dev, libglobus-callout-dev, globus-proxy-utils,krb5-user|heimdal-clients, libmysqlclient-dev, libiodbc2-dev | unixodbc-dev, libpq-dev, gfortran|fortran-compiler, libqt4-dev (>= 4.3.0) | libqt3-mt-dev (>= 3.3.0), qt4-dev-tools (>= 4.3.0) | qt3-dev-tools (>= 3.3.0), libqt4-opengl-dev, libkrb5-dev|heimdal-dev
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/debian-science/packages/root-system.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/root-system.git
diff --git a/debian/patches/73-ruby-1.9.1.patch b/debian/patches/73-ruby-1.9.1.patch
index bf18645..1ef550d 100644
--- a/debian/patches/73-ruby-1.9.1.patch
+++ b/debian/patches/73-ruby-1.9.1.patch
@@ -1,21 +1,30 @@
---- a/bindings/ruby/Module.mk
-+++ b/bindings/ruby/Module.mk
-@@ -87,5 +87,5 @@
- distclean:: distclean-$(MODNAME)
-
- ##### extra rules ######
--$(RUBYROOTO): CXXFLAGS += $(RUBYINCDIR:%=-I%) -Iinclude/cint
--$(RUBY64O): CFLAGS += $(RUBYINCDIR:%=-I%)
-+$(RUBYROOTO): CXXFLAGS += $(RUBYINCDIR:%=-I%) -I$(RUBYARCHINC) -Iinclude/cint
-+$(RUBY64O): CFLAGS += $(RUBYINCDIR:%=-I%) -I$(RUBYARCHINC)
--- a/configure
+++ b/configure
-@@ -4300,7 +4300,7 @@
+@@ -4276,10 +4276,14 @@
+ # Check for Ruby include and library
+ myruby=`$cwhich ruby 2> /dev/null`
+ if test ! "x$myruby" = "x" && test -x "$myruby" ; then
+- rubysysincdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["includedir"]'`
++ rubysysincdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["rubyhdrdir"]'`
+ rubysysarchdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]'`
+ rubysyslibdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["libdir"]'`
+ rubysysarch=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["arch"]'`
++
++ if test "x$rubysysincdir" = "xnil" ; then
++ rubysysincdir=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["includedir"]'`
++ fi
+ fi
+ rubysysarchdir2=
+ if test "x$platform" = "xmacosx" ; then
+@@ -4298,9 +4302,9 @@
+
+ if test "x$arch" = "xwin32" || \
test "x$enable_shared" = "xno" ; then
- check_library_options="libruby-static libruby1.8-static libruby1.9-static"
+- check_library_options="libruby-static libruby1.8-static libruby1.9-static"
++ check_library_options=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["LIBRUBY_A"]' | sed 's|\.a*||'`
else
- check_library_options="libruby libruby1.8 libruby18 libruby1.9 libruby19"
-+ check_library_options="libruby-1.9.1 libruby1.9 libruby19 libruby1.8 libruby18 libruby"
++ check_library_options=`ruby -rrbconfig -e 'puts RbConfig::CONFIG["LIBRUBY"]' | sed 's|\.so.*||'`
fi
check_library "$check_library_options" \
"$enable_shared" "$rubylibdir" \
diff --git a/debian/rules b/debian/rules
index ad054e9..598e00a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,7 @@ CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
EXTRA_LDFLAGS := $(LDFLAGS)
-export CFLAGS EXTRA_LDFLAGS RUBYARCHINC DEB_HOST_MULTIARCH
-
-RUBYHEADERDIR := $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["rubyhdrdir"]')
+export CFLAGS EXTRA_LDFLAGS DEB_HOST_MULTIARCH
ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
PLATFORM = linux
@@ -106,7 +104,6 @@ CONFOPTIONS :=--enable-bonjour \
--with-globus=/usr \
--with-globus-incdir=/usr/include/globus \
--with-globus-libdir=/usr/lib \
- --with-ruby-incdir=$(RUBYHEADERDIR) \
--with-pythia8-incdir=/usr/include/pythia8 \
$(UNUR) \
$(XRD) \
@@ -240,14 +237,10 @@ IPKGOPTS := $(IPKGLIST:%=-p%)
PKGOPTS := $(IPKGOPTS) $(SPKGOPTS)
HAVERUBY := $(filter libroot-bindings-ruby, $(PKGLIST))
ifeq ($(HAVERUBY), libroot-bindings-ruby)
-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)
diff --git a/debian/script/makebuilddepend.sh b/debian/script/makebuilddepend.sh
index 78bff4b..11dadb0 100755
--- a/debian/script/makebuilddepend.sh
+++ b/debian/script/makebuilddepend.sh
@@ -11,8 +11,8 @@ if test "x$1" = "xrpm" ; then
libroot-bindings-python)
echo "BuildRequires: python-devel >= 2.1" ;;
libroot-bindings-ruby)
- echo "BuildRequires: ruby-devel >= 1.9.1"
- echo "BuildRequires: ruby >= 1.9.1" ;;
+ echo "BuildRequires: ruby-devel"
+ echo "BuildRequires: ruby" ;;
libroot-core) ;;
libroot-geom) ;;
libroot-graf2d-gpad) ;;
@@ -185,7 +185,7 @@ for i in $* ; do
libroot-bindings-python)
echo -n ", python-support (>= 0.3)" ;;
libroot-bindings-ruby)
- echo -n ", ruby (>= 4.9), ruby1.9.1-dev | ruby-dev (>= 4.9)" ;;
+ echo -n ", ruby, ruby-dev" ;;
libroot-core) ;;
libroot-geom) ;;
libroot-graf2d-gpad) ;;
--
root-system: CERN's ROOT Data Analysis Framework
More information about the debian-science-commits
mailing list