From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g33H8-0004zQ-MD for guix-patches@gnu.org; Thu, 20 Sep 2018 14:02:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g33H7-0007V5-U6 for guix-patches@gnu.org; Thu, 20 Sep 2018 14:02:02 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:43026) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g33H7-0007Uv-QA for guix-patches@gnu.org; Thu, 20 Sep 2018 14:02:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g33H7-0004bV-Mn for guix-patches@gnu.org; Thu, 20 Sep 2018 14:02:01 -0400 Subject: [bug#32732] [PATCH 1/2] gnu: hdf5: Allow for absence of utility script. Resent-Message-ID: From: Paul Garlick Date: Thu, 20 Sep 2018 18:59:56 +0100 Message-Id: <1537466397-6695-1-git-send-email-pgarlick@tourbillion-technology.com> In-Reply-To: <8736u9f995.fsf@gnu.org> References: <8736u9f995.fsf@gnu.org> 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: 32732@debbugs.gnu.org, ludo@gnu.org Cc: Paul Garlick * gnu/packages/maths.scm (hdf5)[arguments]: Add condition to 'split' phase to check for existence of h5fc script. --- gnu/packages/maths.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 736bac1..30f1610 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -814,8 +814,11 @@ incompatible with HDF5.") (mkdir-p flib) (mkdir-p finc) (mkdir-p fex) - (rename-file (string-append bin "/h5fc") - (string-append fbin "/h5fc")) + ;; Note: When built with --enable-parallel, the 'h5fc' file + ;; doesn't exist, hence this condition. + (when (file-exists? (string-append bin "/h5fc")) + (rename-file (string-append bin "/h5fc") + (string-append fbin "/h5fc"))) (for-each (lambda (file) (rename-file file (string-append flib "/" (basename file)))) -- 1.8.3.1