From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Woodcroft Subject: [PATCH 1/2] gnu: perl: Split configure phase. Date: Tue, 20 Sep 2016 14:56:06 +1000 Message-ID: <20160920045607.18936-2-donttrustben@gmail.com> References: <20160920045607.18936-1-donttrustben@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmD7y-0001Nt-9A for guix-devel@gnu.org; Tue, 20 Sep 2016 00:57:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmD7s-0004Q0-AS for guix-devel@gnu.org; Tue, 20 Sep 2016 00:57:53 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35582) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmD7s-0004Pd-58 for guix-devel@gnu.org; Tue, 20 Sep 2016 00:57:48 -0400 Received: by mail-pf0-f193.google.com with SMTP id 6so365073pfl.2 for ; Mon, 19 Sep 2016 21:57:47 -0700 (PDT) Received: from localhost.localdomain ([103.25.181.216]) by smtp.googlemail.com with ESMTPSA id r7sm12637130pfk.49.2016.09.19.21.56.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Sep 2016 21:56:46 -0700 (PDT) In-Reply-To: <20160920045607.18936-1-donttrustben@gmail.com> 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" To: guix-devel@gnu.org * gnu/packages/perl.scm (perl)[arguments]: Split 'configure' phase into 'setup-configure' and 'configure' phases. --- gnu/packages/perl.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0a26e51..f0c4e36 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -62,22 +62,24 @@ '(#:tests? #f #:phases (modify-phases %standard-phases + (add-before 'configure 'setup-configure + (lambda _ + ;; Use the right path for `pwd'. + (substitute* "dist/PathTools/Cwd.pm" + (("/bin/pwd") + (which "pwd"))) + + ;; Build in GNU89 mode to tolerate C++-style comment in libc's + ;; . + (substitute* "cflags.SH" + (("-std=c89") + "-std=gnu89")) + #t)) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (libc (assoc-ref inputs "libc"))) - ;; Use the right path for `pwd'. - (substitute* "dist/PathTools/Cwd.pm" - (("/bin/pwd") - (which "pwd"))) - - ;; Build in GNU89 mode to tolerate C++-style comment in libc's - ;; . - (substitute* "cflags.SH" - (("-std=c89") - "-std=gnu89")) - (zero? (system* "./Configure" (string-append "-Dprefix=" out) -- 2.10.0