From patchwork Fri May 7 12:22:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 29159 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 7A23927BC82; Fri, 7 May 2021 13:23:22 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 438E627BC81 for ; Fri, 7 May 2021 13:23:22 +0100 (BST) Received: from localhost ([::1]:33052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lezVp-0007Jq-Dx for patchwork@mira.cbaines.net; Fri, 07 May 2021 08:23:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lezVX-0007Ji-7t for guix-patches@gnu.org; Fri, 07 May 2021 08:23:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60270) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lezVX-0006NW-0a for guix-patches@gnu.org; Fri, 07 May 2021 08:23:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lezVV-00068z-Vb; Fri, 07 May 2021 08:23:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48275] [PATCH] gnu: ocaml: Depend on libiberty. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, guix-patches@gnu.org Resent-Date: Fri, 07 May 2021 12:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48275 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48275@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Julien Lepiller X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Julien Lepiller Received: via spool by submit@debbugs.gnu.org id=B.162039014923591 (code B ref -1); Fri, 07 May 2021 12:23:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 May 2021 12:22:29 +0000 Received: from localhost ([127.0.0.1]:43581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lezUz-00068P-CG for submit@debbugs.gnu.org; Fri, 07 May 2021 08:22:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:34606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lezUx-00068J-Da for submit@debbugs.gnu.org; Fri, 07 May 2021 08:22:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lezUx-0007HG-7k for guix-patches@gnu.org; Fri, 07 May 2021 08:22:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45260) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lezUw-00065A-42; Fri, 07 May 2021 08:22:26 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=41568 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lezUv-0005ra-Sy; Fri, 07 May 2021 08:22:26 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 7 May 2021 14:22:18 +0200 Message-Id: <20210507122218.25615-1-ludo@gnu.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 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 From: Ludovic Courtès Currently gcc:lib does not include libiberty so this change restores the initial intent. * gnu/packages/ocaml.scm (ocaml-4.11)[inputs]: Replace "gcc:lib" by "libiberty". --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Hi there! I noticed that “guix graph ocaml” looked weird; this change clarifies the original intent. In fact, the addition of gcc:lib was useless AFAICS: --8<---------------cut here---------------start------------->8--- $ guix build -e '(@@ (gnu packages commencement) gcc-final)' /gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib /gnu/store/rn75fm7adgx3pw5j8pg3bczfqq1y17lk-gcc-7.5.0 $ ls /gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/*ibert* ls: ne eblas atingi '/gnu/store/01b4w3m6mp55y531kyi1g8shh722kwqm-gcc-7.5.0-lib/lib/*ibert*': Dosiero aŭ dosierujo ne ekzistas --8<---------------cut here---------------end--------------->8--- With this change I see that libiberty is indeed used while building ocaml@4.11: --8<---------------cut here---------------start------------->8--- ../boot/ocamlrun ../boot/ocamlc -g -nostdlib -I ../boot -use-prims ../runtime/primitives -I .. -c -absname -w +a-4-9-41-42-44-45-48 -strict-sequence -warn-error A -principal -safe-string -strict-formats -bin-annot -I ../utils -I ../parsing -I ../typing -I ../bytecomp -I ../middle_end -I ../middle_end/closure -I ../middle_end/flambda -I ../middle_end/flambda/base_types -I ../driver -I ../toplevel -I ../file_formats -I ../lambda - opnames.ml gcc -O2 -fno-strict-aliasing -fwrapv -Wall -Wdeclaration-after-statement -fno-common -fexcess-precision=standard -fno-tree-vrp -ffunction-sections -o objinfo_helper objinfo_helper.o -lbfd -ldl -liberty -lz --8<---------------cut here---------------end--------------->8--- There’s no ‘-liberty’ in the build log of 4.09 though. According to ‘guix refresh -l ocaml ocaml@4.09’, this change is OK for ‘master’. Thoughts? Ludo’. diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 427ea38ccc..272f5bf268 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -200,8 +200,7 @@ This package produces a native @command{ocamlc} and a bytecode @command{ocamllex ("pkg-config" ,pkg-config))) (inputs `(("libx11" ,libx11) - ;; For libiberty, needed for objdump support. - ("gcc:lib" ,(canonical-package gcc) "lib") + ("libiberty" ,libiberty) ;needed for objdump support ("zlib" ,zlib))) ;also needed for objdump support (arguments `(#:phases