From patchwork Fri Aug 20 12:48:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32212 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 69D3027BC78; Fri, 20 Aug 2021 13:53:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 35EE027BC6B for ; Fri, 20 Aug 2021 13:53:58 +0100 (BST) Received: from localhost ([::1]:34506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH421-0003u0-9q for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:53:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yE-0000Jz-Qk for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yE-0001IW-Ja for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3yE-0002ed-Hs for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 02/12] gnu: ocamlbuild: Fix reference to output. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50134 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50134@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50134-submit@debbugs.gnu.org id=B50134.162946375210063 (code B ref 50134); Fri, 20 Aug 2021 12:50:02 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:12 +0000 Received: from localhost ([127.0.0.1]:33208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xO-0002c3-LK for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:12 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xB-0002aS-T4 for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:01 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406ooxG0; Fri, 20 Aug 2021 14:48:57 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:38 +0200 Message-Id: <20210820124848.13293-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210820124848.13293-1-maximedevos@telenet.be> References: <215b0088e542b2fb9bcf3be9ff74c5874770f878.camel@telenet.be> <20210820124848.13293-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629463737; bh=HJn0WxEIU9EfesMv2W1c7J5wJk3kwixOZQZH3QHP/Ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aEm5WnGqdLxlAiEifyrlwyJxoCLiX5RHdEQH3/37cc4+LO/yRud7Fuu6Q8PmZ/tAu Kbk2oGKa0qg2QPfiXPKDDrfjBh0V2rPncAp+EUrY5w0tcTZqh1NjAMNJM3LSFULp03 AzwIvdUFEqL8CMaj4nmY66tfgQjnnYpiSxFZZegzo5+g63fre6Wxsmqi/LsPtFK9PH ZP0zbWj+Wbkzs5l+1ymReIbv2MSsWNkx9tf7JrbDGQwKexeRALGqPKpuTJMLAYEhpK IV4QmwkX5xjZBRcAcHQnkZp+1IAvkMg/oFxtSK8X6PTHNuFlMc8h4YrsFpYuinyBpn KNMQT7E3y0iCw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocamlbuild)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b8d52bb283..1624823394 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -456,13 +456,11 @@ depend: $(STDLIB_MLIS) $(STDLIB_DEPS)")) (build-system ocaml-build-system) (arguments `(#:make-flags - (list (string-append "OCAMLBUILD_PREFIX=" (assoc-ref %outputs "out")) - (string-append "OCAMLBUILD_BINDIR=" (assoc-ref %outputs "out") - "/bin") - (string-append "OCAMLBUILD_LIBDIR=" (assoc-ref %outputs "out") - "/lib/ocaml/site-lib") - (string-append "OCAMLBUILD_MANDIR=" (assoc-ref %outputs "out") - "/share/man")) + ,#~(list (string-append "OCAMLBUILD_PREFIX=" #$output) + (string-append "OCAMLBUILD_BINDIR=" #$output "/bin") + (string-append "OCAMLBUILD_LIBDIR=" #$output + "/lib/ocaml/site-lib") + (string-append "OCAMLBUILD_MANDIR=" #$output "/share/man")) #:phases (modify-phases %standard-phases (delete 'configure))