From c965dda2ddcea60dad5286702d6d2fd7bf05afdd Mon Sep 17 00:00:00 2001 From: Jake Farrell Date: Sun, 6 Nov 2011 20:29:26 +0000 Subject: [PATCH] Thrift-1421: Debian Packages can not be built (ruby build fails) Client: deb Patch: Jake Farrell Removing ruby from deb as it is now available as a gem. git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1198549 13f79535-47bb-0310-9956-ffa450edef68 --- contrib/debian/rules | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/contrib/debian/rules b/contrib/debian/rules index 1eef26e1..e24f946a 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -52,11 +52,6 @@ build-arch-stamp: configure-stamp $$py-dbg setup.py build; \ done - # Ruby library - cd $(CURDIR)/lib/rb && \ - ruby setup.rb config --installdirs=std && \ - ruby setup.rb setup - # PHP cd $(CURDIR)/lib/php/src/ext/thrift_protocol && \ phpize && \ @@ -106,7 +101,7 @@ install-indep: # debian/-doc. #INSTALLDOC# - # Java + # Java mkdir -p $(CURDIR)/debian/libthrift-java/usr/share/java/ && \ cp $(CURDIR)/lib/java/build/libthrift*.jar \ $(CURDIR)/debian/libthrift-java/usr/share/java/ @@ -138,13 +133,13 @@ install-arch: # debian/tmp. #$(MAKE) DESTDIR=$(CURDIR)/debian/thrift install - #compiler + # Compiler mkdir -p $(CURDIR)/debian/thrift-compiler/usr/bin && \ cp $(CURDIR)/compiler/cpp/thrift \ $(CURDIR)/debian/thrift-compiler/usr/bin/thrift && \ rmdir $(CURDIR)/debian/thrift-compiler/usr/sbin - #python + # Python cd $(CURDIR)/lib/py && \ for py in $(PYVERS); do \ $$py setup.py install --no-compile --root=$(CURDIR)/debian/python-thrift; \ @@ -156,11 +151,6 @@ install-arch: find $(CURDIR)/debian/python-thrift-dbg -name "*.egg-info" -print0 | xargs -0 rm -f find $(CURDIR)/debian/python-thrift-dbg -depth -type d -empty -exec rmdir {} \; - #ruby - mkdir -p $(CURDIR)/debian/libthrift-ruby && \ - cd $(CURDIR)/lib/rb && \ - ruby setup.rb install --prefix=$(CURDIR)/debian/libthrift-ruby - # PHP mkdir -p $(CURDIR)/debian/php5-thrift cd $(CURDIR)/lib/php && \ @@ -187,7 +177,7 @@ binary-common: dh_installexamples dh_installman dh_link - dh_strip -Npython-thrift-dbg -Nthrift-compiler -Nlibthrift0 -Nlibthrift-ruby --dbg=python-thrift-dbg + dh_strip -Npython-thrift-dbg -Nthrift-compiler -Nlibthrift0 --dbg=python-thrift-dbg dh_strip -Npython-thrift-dbg dh_compress dh_fixperms -- 2.17.1