From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:33187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsCbt-0002oh-DM for guix-patches@gnu.org; Fri, 08 Feb 2019 15:18:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gsCbk-0001P3-4I for guix-patches@gnu.org; Fri, 08 Feb 2019 15:18:50 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40884) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gsCbd-00018q-CF for guix-patches@gnu.org; Fri, 08 Feb 2019 15:18:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gsCGj-00075D-IR for guix-patches@gnu.org; Fri, 08 Feb 2019 14:57:01 -0500 Subject: [bug#34385] [PATCH v2 3/3] guix: ruby-build-system: Fix removal of extension related files. Resent-Message-ID: From: Christopher Baines Date: Fri, 8 Feb 2019 19:56:42 +0000 Message-Id: <20190208195642.4057-3-mail@cbaines.net> In-Reply-To: <20190208195642.4057-1-mail@cbaines.net> References: <875ztur313.fsf@cbaines.net> <20190208195642.4057-1-mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34385@debbugs.gnu.org This functionality was broken, possibly to do with the vendor related changes in the ruby build system. These changes restore the file removal functionality at the end of the install phase. * guix/build/ruby-build-system.scm (install): Fix removal of files related to native extensions. --- guix/build/ruby-build-system.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm index 64b4400f1a..ba0de1259e 100644 --- a/guix/build/ruby-build-system.scm +++ b/guix/build/ruby-build-system.scm @@ -139,7 +139,8 @@ GEM-FLAGS are passed to the 'gem' invokation, if present." (gem-file-basename (basename gem-file)) (gem-name (substring gem-file-basename 0 - (- (string-length gem-file-basename) 4)))) + (- (string-length gem-file-basename) 4))) + (gem-dir (string-append vendor-dir "/gems/" gem-name))) (setenv "GEM_VENDOR" vendor-dir) (or (zero? @@ -165,7 +166,7 @@ GEM-FLAGS are passed to the 'gem' invokation, if present." ;; For gems with native extensions, several Makefile-related files ;; are created that contain timestamps or other elements making ;; them not reproducible. They are unnecessary so we remove them. - (when (file-exists? (string-append vendor-dir "/ext")) + (when (file-exists? (string-append gem-dir "/ext")) (for-each (lambda (file) (log-file-deletion file) (delete-file file)) @@ -174,7 +175,7 @@ GEM-FLAGS are passed to the 'gem' invokation, if present." "page-Makefile.ri") (find-files (string-append vendor-dir "/extensions") "gem_make.out") - (find-files (string-append vendor-dir "/ext") + (find-files (string-append gem-dir "/ext") "Makefile")))) #t)) -- 2.20.1