From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pjotr Prins Subject: [PATCH] gnu: ruby: Allow 'rake gem' in ruby-build-system. Date: Mon, 13 Jul 2015 14:59:58 +0200 Message-ID: <20150713125958.GA28969@thebird.nl> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="k+w/mQv8wyuph6w0" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEdM3-0000OY-Dg for guix-devel@gnu.org; Mon, 13 Jul 2015 09:01:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEdM0-0007Ae-7B for guix-devel@gnu.org; Mon, 13 Jul 2015 09:01:07 -0400 Received: from mail.thebird.nl ([95.154.246.10]:42189) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEdM0-00078B-1N for guix-devel@gnu.org; Mon, 13 Jul 2015 09:01:04 -0400 Content-Disposition: inline List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: "guix-devel@gnu.org" --k+w/mQv8wyuph6w0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Modification of the Ruby build system preparing for the Nokogiri patch (next mail). Pj. --k+w/mQv8wyuph6w0 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-ruby-Allow-rake-gem-in-ruby-build-system.patch" >From 8bdeef9e44abc0ed5e8491d360cc1e9e9de72420 Mon Sep 17 00:00:00 2001 From: pjotrp Date: Sun, 5 Jul 2015 18:00:22 +0200 Subject: [PATCH] gnu: ruby: Allow 'rake gem' in ruby-build-system. * guix/build/ruby-build-system.scm (Ruby): Added 'rake gem' when gemspec is missing. --- guix/build/ruby-build-system.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm index 531cf38..ce0c17d 100644 --- a/guix/build/ruby-build-system.scm +++ b/guix/build/ruby-build-system.scm @@ -49,7 +49,10 @@ directory." (define build (lambda _ - (zero? (system* "gem" "build" (first-matching-file "\\.gemspec$"))))) + (let ((fnlist (find-files "." "\\.gemspec$"))) + (if (null? fnlist) + (zero? (system* "rake" "gem")) + (zero? (system* "gem" "build" (car fnlist))))))) (define* (check #:key tests? test-target #:allow-other-keys) (if tests? -- 1.7.10.4 --k+w/mQv8wyuph6w0--